@cedarjs/storage 9.0.0-canary.1784 → 9.0.0-canary.3124

package/README.md

@@ -1,5 +1,11 @@
 # `@cedarjs/storage`
 
+> **Deprecated.** `@cedarjs/storage` is superseded by
+> [`@cedarjs/uploads`](../uploads/README.md), which replaces the Prisma
+> extension and savers with explicit service calls, named storage targets, and
+> token-gated upload routes. This package will be removed in a future major
+> release. See the [migration guide](https://cedarjs.com/docs/uploads#migrating-from-cedarjsstorage).
+
 This package houses
 
 - Prisma extension for handling uploads. Currently

package/dist/createSavers.d.ts

@@ -1,12 +1,12 @@
 import type { SaveOptionsOverride, BaseStorageAdapter } from './adapters/BaseStorageAdapter.js';
-import type { ModelNames, UploadsConfig } from './prismaExtension.js';
+import type { ModelNamesFor, UploadsConfig } from './prismaExtension.js';
 type MakeFilesString<T> = {
     [K in keyof T]: T[K] extends File ? string : T[K];
 };
 export declare const createFileListSaver: (storage: BaseStorageAdapter) => (files?: File[], pathOverrideOnly?: {
     path?: string;
 }) => Promise<string[]>;
-export declare const createUploadSavers: <MNames extends ModelNames = ModelNames>(uploadConfig: UploadsConfig<MNames>, storage: BaseStorageAdapter) => { [K in `for${Capitalize<MNames>}`]: <T extends Record<string, any>>(data: T, overrideSaveOptions?: SaveOptionsOverride) => Promise<MakeFilesString<T>>; } & {
+export declare const createUploadSavers: <TClient, MNames extends ModelNamesFor<TClient> = ModelNamesFor<TClient>>(uploadConfig: UploadsConfig<TClient, MNames>, storage: BaseStorageAdapter) => { [K in `for${Capitalize<string & MNames>}`]: <T extends Record<string, any>>(data: T, overrideSaveOptions?: SaveOptionsOverride) => Promise<MakeFilesString<T>>; } & {
     inList: (files?: File[], pathOverrideOnly?: {
         path?: string;
     }) => Promise<string[]>;

package/dist/createSavers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSavers.d.ts","sourceRoot":"","sources":["../src/createSavers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,kCAAkC,CAAA;AACzC,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAGrE,KAAK,eAAe,CAAC,CAAC,IAAI;KACvB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;CAClD,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,SAAS,kBAAkB,MAC/C,QAAO,IAAI,EAAO,EAAE,mBAAmB;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,sBAUvE,CAAA;AAMD,eAAO,MAAM,kBAAkB,GAAI,MAAM,SAAS,UAAU,GAAG,UAAU,EACvE,cAAc,aAAa,CAAC,MAAM,CAAC,EACnC,SAAS,kBAAkB,QAMxB,CAAC,kCAAwB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAC/C,CAAC,wBACe,mBAAmB,KACtC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;qBA3Bb,IAAI,EAAE,qBAA0B;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE;CA2EvE,CAAA"}
+{"version":3,"file":"createSavers.d.ts","sourceRoot":"","sources":["../src/createSavers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,kCAAkC,CAAA;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAGxE,KAAK,eAAe,CAAC,CAAC,IAAI;KACvB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;CAClD,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,SAAS,kBAAkB,MAC/C,QAAO,IAAI,EAAO,EAAE,mBAAmB;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,sBAUvE,CAAA;AAMD,eAAO,MAAM,kBAAkB,GAC7B,OAAO,EACP,MAAM,SAAS,aAAa,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EAE9D,cAAc,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,EAC5C,SAAS,kBAAkB,QAMxB,CAAC,2CAAwB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAC/C,CAAC,wBACe,mBAAmB,KACtC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;qBA9Bb,IAAI,EAAE,qBAA0B;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE;CA8EvE,CAAA"}

package/dist/index.d.ts

@@ -1,13 +1,13 @@
 import type { BaseStorageAdapter } from './adapters/BaseStorageAdapter.js';
-import type { ModelNames, UploadConfigForModel, UploadsConfig } from './prismaExtension.js';
+import type { ModelNamesFor, UploadConfigForModel, UploadsConfig } from './prismaExtension.js';
 import type { UrlSigner } from './UrlSigner.js';
-type SetupStorageOptions<MNames extends ModelNames> = {
-    uploadsConfig: UploadsConfig<MNames>;
+type SetupStorageOptions<TClient, MNames extends ModelNamesFor<TClient> = ModelNamesFor<TClient>> = {
+    uploadsConfig: UploadsConfig<TClient, MNames>;
     storageAdapter: BaseStorageAdapter;
     urlSigner?: UrlSigner;
 };
-export declare const setupStorage: <MNames extends ModelNames>({ uploadsConfig, storageAdapter, urlSigner, }: SetupStorageOptions<MNames>) => {
-    storagePrismaExtension: (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{ [K in MNames]: {
+export declare const setupStorage: <TClient, MNames extends ModelNamesFor<TClient> = ModelNamesFor<TClient>>({ uploadsConfig, storageAdapter, urlSigner, }: SetupStorageOptions<TClient, MNames>) => {
+    storagePrismaExtension: (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/client").InternalArgs<{ [K in MNames]: {
         withDataUri: {
             needs: Record<string, boolean>;
             compute: (modelData: Record<string, unknown>) => <T>(this: T) => Promise<T>;
@@ -18,8 +18,8 @@ export declare const setupStorage: <MNames extends ModelNames>({ uploadsConfig,
                 expiresIn?: number;
             }) => T;
         };
-    }; }, {}, {}, {}> & import("@prisma/client/runtime/library").DefaultArgs>;
-    saveFiles: { [K in `for${Capitalize<MNames>}`]: <T extends Record<string, any>>(data: T, overrideSaveOptions?: import("./adapters/BaseStorageAdapter.js").SaveOptionsOverride) => Promise<{ [K_2 in keyof T]: T[K_2] extends File ? string : T[K_2]; }>; } & {
+    }; }, {}, {}, {}> & import("@prisma/client/runtime/client").DefaultArgs>;
+    saveFiles: { [K in `for${Capitalize<string & MNames>}`]: <T extends Record<string, any>>(data: T, overrideSaveOptions?: import("./adapters/BaseStorageAdapter.js").SaveOptionsOverride) => Promise<{ [K_2 in keyof T]: T[K_2] extends File ? string : T[K_2]; }>; } & {
         inList: (files?: File[], pathOverrideOnly?: {
             path?: string;
         }) => Promise<string[]>;
@@ -33,8 +33,8 @@ export declare const setupStorage: <MNames extends ModelNames>({ uploadsConfig,
  * @param uploadsConfig The uploads configuration object.
  * @returns The same uploads configuration object, but with filtered types
  */
-export declare function createUploadsConfig<T extends Partial<{
-    [K in ModelNames]?: UploadConfigForModel<K>;
+export declare function createUploadsConfig<TClient, T extends Partial<{
+    [K in ModelNamesFor<TClient>]?: UploadConfigForModel<TClient, K>;
 }>>(uploadsConfig: T): T;
-export type { ModelNames, UploadsConfig } from './prismaExtension.js';
+export type { ModelNamesFor, UploadsConfig } from './prismaExtension.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAE1E,OAAO,KAAK,EACV,UAAU,EACV,oBAAoB,EACpB,aAAa,EACd,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE/C,KAAK,mBAAmB,CAAC,MAAM,SAAS,UAAU,IAAI;IACpD,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IACpC,cAAc,EAAE,kBAAkB,CAAA;IAClC,SAAS,CAAC,EAAE,SAAS,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,MAAM,SAAS,UAAU,EAAE,+CAIrD,mBAAmB,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;gBARV,CAAC;;;CAqBpB,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,CAAC,SAAS,OAAO,CAAC;KACf,CAAC,IAAI,UAAU,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC;CAC5C,CAAC,EACF,aAAa,EAAE,CAAC,GAAG,CAAC,CAErB;AAED,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAE1E,OAAO,KAAK,EACV,aAAa,EACb,oBAAoB,EACpB,aAAa,EACd,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAY/C,KAAK,mBAAmB,CACtB,OAAO,EACP,MAAM,SAAS,aAAa,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,IAC5D;IACF,aAAa,EAAE,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC7C,cAAc,EAAE,kBAAkB,CAAA;IAClC,SAAS,CAAC,EAAE,SAAS,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,YAAY,GACvB,OAAO,EACP,MAAM,SAAS,aAAa,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EAC9D,+CAIC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;gBAzBE,CAAC;;;CAsCzC,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EACP,CAAC,SAAS,OAAO,CAAC;KACf,CAAC,IAAI,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,OAAO,EAAE,CAAC,CAAC;CACjE,CAAC,EACF,aAAa,EAAE,CAAC,GAAG,CAAC,CAErB;AAED,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA"}

package/dist/index.js

@@ -1,5 +1,10 @@
 import { createUploadSavers } from "./createSavers.js";
 import { createUploadsExtension } from "./prismaExtension.js";
+if (!process.env.CEDAR_SUPPRESS_STORAGE_DEPRECATION) {
+  console.warn(
+    "[@cedarjs/storage] This package is deprecated and will be removed in a future major release. Migrate to @cedarjs/uploads: https://cedarjs.com/docs/uploads#migrating-from-cedarjsstorage"
+  );
+}
 const setupStorage = ({
   uploadsConfig,
   storageAdapter,

package/dist/prismaExtension.d.ts

@@ -1,21 +1,19 @@
-import { PrismaClient } from '@prisma/client';
-import type { Prisma } from '@prisma/client';
-import type * as runtime from '@prisma/client/runtime/library';
+import { Prisma as PrismaExtension } from '@prisma/client/extension';
 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;
-export type ModelNames = FilterOutDollarPrefixed<keyof PrismaClient>;
-type PrismaModelFields<MName extends ModelNames> = keyof Prisma.Result<PrismaClient[MName], any, 'findFirstOrThrow'>;
-export type UploadConfigForModel<TPrismaModelName extends ModelNames> = {
-    fields: PrismaModelFields<TPrismaModelName> | PrismaModelFields<TPrismaModelName>[];
+export type ModelNamesFor<TClient> = FilterOutDollarPrefixed<keyof TClient>;
+type PrismaModelFields<TClient, MName extends ModelNamesFor<TClient>> = keyof PrismaExtension.Result<TClient[MName], any, 'findFirstOrThrow'>;
+export type UploadConfigForModel<TClient, TPrismaModelName extends ModelNamesFor<TClient>> = {
+    fields: PrismaModelFields<TClient, TPrismaModelName> | PrismaModelFields<TClient, TPrismaModelName>[];
 };
-export type UploadsConfig<MNames extends ModelNames = ModelNames> = {
-    [K in MNames]?: UploadConfigForModel<K>;
+export type UploadsConfig<TClient, MNames extends ModelNamesFor<TClient> = ModelNamesFor<TClient>> = {
+    [K in MNames]?: UploadConfigForModel<TClient, K>;
 };
 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: <TClient, MNames extends ModelNamesFor<TClient> = ModelNamesFor<TClient>>(config: UploadsConfig<TClient, MNames>, storageAdapter: BaseStorageAdapter, urlSigner?: UrlSigner) => (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/client").InternalArgs<{ [K in MNames]: {
     withDataUri: {
         needs: Record<string, boolean>;
         compute: (modelData: Record<string, unknown>) => <T>(this: T) => Promise<T>;
@@ -24,6 +22,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/client").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,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAEpE,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,aAAa,CAAC,OAAO,IAAI,uBAAuB,CAAC,MAAM,OAAO,CAAC,CAAA;AAE3E,KAAK,iBAAiB,CACpB,OAAO,EACP,KAAK,SAAS,aAAa,CAAC,OAAO,CAAC,IAClC,MAAM,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAA;AAEzE,MAAM,MAAM,oBAAoB,CAC9B,OAAO,EACP,gBAAgB,SAAS,aAAa,CAAC,OAAO,CAAC,IAC7C;IACF,MAAM,EACF,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAC5C,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE,CAAA;CACnD,CAAA;AAED,MAAM,MAAM,aAAa,CACvB,OAAO,EACP,MAAM,SAAS,aAAa,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,IAC5D;KACD,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,oBAAoB,CAAC,OAAO,EAAE,CAAC,CAAC;CACjD,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,sBAAsB,GACjC,OAAO,EACP,MAAM,SAAS,aAAa,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EAE9D,QAAQ,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,EACtC,gBAAgB,kBAAkB,EAClC,YAAY,SAAS,qIAGlB,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;wEA+RN,CAAA"}

package/dist/prismaExtension.js

@@ -1,194 +1,188 @@
-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) {
+            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) => {
+            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,
+              select: Object.fromEntries(
+                uploadFieldsToUpdate.map((f) => [f, true])
+              )
+            });
+            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,
+              select: Object.fromEntries(
+                uploadFieldsToUpdate.map((f) => [f, true])
+              )
+            });
+            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;
+            }
+          }
+        },
+        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,
+                ...uploadFieldsToUpdate.length > 0 ? {
+                  select: Object.fromEntries(
+                    uploadFieldsToUpdate.map((f) => [f, true])
+                  )
+                } : {}
+              });
+              isUpdate = !!existingRecord;
+            }
+            const result = await query(args);
+            if (isUpdate && existingRecord) {
+              await removeUploadedFiles(uploadFieldsToUpdate, existingRecord);
             }
             return result;
           } catch (e) {
             await removeUploadedFiles(
-              uploadFieldsToUpdate,
-              args.data
+              // Only delete files we're updating on update
+              isUpdate ? uploadFieldsToUpdate : uploadFields,
+              isUpdate ? args.update : args.create
             );
             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({
-              where: args.where
-            });
-            isUpdate = !!existingRecord;
-          }
-          const result = await query(args);
-          if (isUpdate && existingRecord) {
-            await removeUploadedFiles(uploadFieldsToUpdate, existingRecord);
-          }
-          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": "9.0.0-canary.1784+baa47810a",
+  "version": "9.0.0-canary.3124",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -10,68 +10,57 @@
   "type": "module",
   "exports": {
     ".": {
-      "require": {
-        "types": "./dist/cjs/index.d.ts",
-        "default": "./dist/cjs/index.js"
-      },
-      "import": {
+      "default": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
       }
     },
-    "./FileSystemStorage": {
-      "require": "./dist/cjs/adapters/FileSystemStorage/FileSystemStorage.js",
-      "import": "./dist/adapters/FileSystemStorage/FileSystemStorage.js"
-    },
-    "./MemoryStorage": {
-      "require": "./dist/cjs/adapters/MemoryStorage/MemoryStorage.js",
-      "import": "./dist/adapters/MemoryStorage/MemoryStorage.js"
-    },
-    "./BaseStorageAdapter": {
-      "require": "./dist/cjs/adapters/BaseStorageAdapter.js",
-      "import": "./dist/adapters/BaseStorageAdapter.js"
-    },
-    "./UrlSigner": {
-      "require": "./dist/cjs/UrlSigner.js",
-      "import": "./dist/UrlSigner.js"
-    }
+    "./FileSystemStorage": "./dist/adapters/FileSystemStorage/FileSystemStorage.js",
+    "./MemoryStorage": "./dist/adapters/MemoryStorage/MemoryStorage.js",
+    "./BaseStorageAdapter": "./dist/adapters/BaseStorageAdapter.js",
+    "./UrlSigner": "./dist/UrlSigner.js"
   },
   "files": [
     "dist",
     "!dist/**/*.test.d.*"
   ],
   "scripts": {
-    "build": "yarn setup:test && tsx ./build.mts",
+    "build": "node ./build.mts",
     "build:pack": "yarn pack -o cedarjs-storage.tgz",
     "build:types": "tsc --build --verbose ./tsconfig.build.json",
-    "build:types-cjs": "tsc --build --verbose tsconfig.types-cjs.json",
-    "check:attw": "tsx attw.ts",
+    "check:attw": "yarn cedar-fwtools-attw",
     "check:package": "concurrently npm:check:attw yarn publint",
-    "setup:test": "npx prisma db push --accept-data-loss --config ./src/__tests__/prisma.config.ts",
+    "setup:test": "npx prisma db push --accept-data-loss --config ./src/__tests__/prisma.config.ts && npx prisma generate --config ./src/__tests__/prisma.config.ts",
     "test": "vitest run",
     "test:types": "yarn setup:test && tstyche",
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/project-config": "9.0.0-canary.1784",
+    "@cedarjs/project-config": "9.0.0-canary.3124",
     "mime-types": "2.1.35",
     "ulid": "3.0.2"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "0.18.2",
-    "@cedarjs/framework-tools": "9.0.0-canary.1784",
-    "@prisma/client": "6.19.2",
+    "@arethetypeswrong/cli": "0.18.5",
+    "@cedarjs/framework-tools": "9.0.0-canary.3124",
+    "@prisma/adapter-better-sqlite3": "7.10.0",
+    "@prisma/client": "7.10.0",
+    "@types/better-sqlite3": "7.6.13",
     "@types/mime-types": "2.1.4",
-    "concurrently": "9.2.1",
-    "esbuild": "0.21.5",
-    "publint": "0.3.17",
+    "better-sqlite3": "12.11.1",
+    "concurrently": "9.2.4",
+    "esbuild": "0.28.2",
+    "prisma": "7.10.0",
+    "publint": "0.3.24",
     "tstyche": "5.0.2",
-    "tsx": "4.21.0",
     "typescript": "5.9.3",
-    "vitest": "3.2.4"
+    "vitest": "4.1.11"
+  },
+  "engines": {
+    "node": ">=24"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "baa47810a7defb73de27fdf513b815d679509b5e"
+  "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 Cedar
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.