Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-12 07:43:16 +10:00
Code Issues Packages Projects Releases Wiki Activity

feat: add prisma json types (#1583)

Browse Source
This commit is contained in:
David Nguyen
2025-01-15 13:46:45 +11:00
committed by GitHub
parent 901be70f97
commit 5750f2b477
21 changed files with 174 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/documentation/package.json
View File

@ -27,6 +27,6 @@
"@types/node": "^20", "@types/node": "^20",
"@types/react": "^18", "@types/react": "^18",
"@types/react-dom": "^18", "@types/react-dom": "^18",
"typescript": "^5" "typescript": "5.6.2"
} }
} }

6
apps/openpage-api/package.json
View File

@ -16,8 +16,8 @@
"next": "14.2.6" "next": "14.2.6"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "20.16.5", "@types/node": "^20",
"@types/react": "18.3.5", "@types/react": "18.3.5",
"typescript": "5.5.4" "typescript": "5.6.2"
} }
} }

6
apps/web/package.json
View File

@ -68,11 +68,11 @@
"@simplewebauthn/types": "^9.0.1", "@simplewebauthn/types": "^9.0.1",
"@types/formidable": "^2.0.6", "@types/formidable": "^2.0.6",
"@types/luxon": "^3.3.1", "@types/luxon": "^3.3.1",
"@types/node": "20.1.0", "@types/node": "^20",
"@types/papaparse": "^5.3.14", "@types/papaparse": "^5.3.14",
"@types/react": "^18", "@types/react": "^18",
"@types/react-dom": "^18", "@types/react-dom": "^18",
"@types/ua-parser-js": "^0.7.39", "@types/ua-parser-js": "^0.7.39",
"typescript": "5.2.2" "typescript": "5.6.2"
} }
} }

171
package-lock.json generated
View File

@ -20,6 +20,7 @@
"mupdf": "^1.0.0", "mupdf": "^1.0.0",
"next-runtime-env": "^3.2.0", "next-runtime-env": "^3.2.0",
"react": "^18", "react": "^18",
"typescript": "5.6.2",
"zod": "3.24.1" "zod": "3.24.1"
}, },
"devDependencies": { "devDependencies": {
@ -63,7 +64,7 @@
"@types/node": "^20", "@types/node": "^20",
"@types/react": "^18", "@types/react": "^18",
"@types/react-dom": "^18", "@types/react-dom": "^18",
"typescript": "^5" "typescript": "5.6.2"
} }
}, },
"apps/documentation/node_modules/next-plausible": { "apps/documentation/node_modules/next-plausible": {
@ -88,18 +89,9 @@
"next": "14.2.6" "next": "14.2.6"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "20.16.5", "@types/node": "^20",
"@types/react": "18.3.5", "@types/react": "18.3.5",
"typescript": "5.5.4" "typescript": "5.6.2"
}
},
"apps/openpage-api/node_modules/@types/node": {
"version": "20.16.5",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
"integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
"dev": true,
"dependencies": {
"undici-types": "~6.19.2"
} }
}, },
"apps/openpage-api/node_modules/@types/react": { "apps/openpage-api/node_modules/@types/react": {
@ -112,25 +104,6 @@
"csstype": "^3.0.2" "csstype": "^3.0.2"
} }
}, },
"apps/openpage-api/node_modules/typescript": {
"version": "5.5.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
"integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
"dev": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
},
"engines": {
"node": ">=14.17"
}
},
"apps/openpage-api/node_modules/undici-types": {
"version": "6.19.8",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
"integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
"dev": true
},
"apps/web": { "apps/web": {
"name": "@documenso/web", "name": "@documenso/web",
"version": "1.9.0-rc.8", "version": "1.9.0-rc.8",
@ -190,20 +163,14 @@
"@simplewebauthn/types": "^9.0.1", "@simplewebauthn/types": "^9.0.1",
"@types/formidable": "^2.0.6", "@types/formidable": "^2.0.6",
"@types/luxon": "^3.3.1", "@types/luxon": "^3.3.1",
"@types/node": "20.1.0", "@types/node": "^20",
"@types/papaparse": "^5.3.14", "@types/papaparse": "^5.3.14",
"@types/react": "^18", "@types/react": "^18",
"@types/react-dom": "^18", "@types/react-dom": "^18",
"@types/ua-parser-js": "^0.7.39", "@types/ua-parser-js": "^0.7.39",
"typescript": "5.2.2" "typescript": "5.6.2"
} }
}, },
"apps/web/node_modules/@types/node": {
"version": "20.1.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.0.tgz",
"integrity": "sha512-O+z53uwx64xY7D6roOi4+jApDGFg0qn6WHcxe5QeqjMaTezBO/mxdfFXIVAVVyNWKx84OmPB3L8kbVYOTeN34A==",
"dev": true
},
"apps/web/node_modules/next-axiom": { "apps/web/node_modules/next-axiom": {
"version": "1.5.1", "version": "1.5.1",
"resolved": "https://registry.npmjs.org/next-axiom/-/next-axiom-1.5.1.tgz", "resolved": "https://registry.npmjs.org/next-axiom/-/next-axiom-1.5.1.tgz",
@ -221,19 +188,6 @@
"react": ">=18.0.0" "react": ">=18.0.0"
} }
}, },
"apps/web/node_modules/typescript": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
"integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
"dev": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
},
"engines": {
"node": ">=14.17"
}
},
"node_modules/@aashutoshrathi/word-wrap": { "node_modules/@aashutoshrathi/word-wrap": {
"version": "1.2.6", "version": "1.2.6",
"resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
@ -10205,7 +10159,8 @@
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "20.5.1", "version": "20.5.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.1.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.1.tgz",
"integrity": "sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg==" "integrity": "sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg==",
"license": "MIT"
}, },
"node_modules/@types/node-fetch": { "node_modules/@types/node-fetch": {
"version": "2.6.11", "version": "2.6.11",
@ -32257,9 +32212,10 @@
} }
}, },
"node_modules/typescript": { "node_modules/typescript": {
"version": "5.3.2", "version": "5.6.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
"integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
"license": "Apache-2.0",
"bin": { "bin": {
"tsc": "bin/tsc", "tsc": "bin/tsc",
"tsserver": "bin/tsserver" "tsserver": "bin/tsserver"
@ -34132,24 +34088,10 @@
"@documenso/prisma": "*", "@documenso/prisma": "*",
"@documenso/web": "*", "@documenso/web": "*",
"@playwright/test": "^1.18.1", "@playwright/test": "^1.18.1",
"@types/node": "^20.8.2", "@types/node": "^20",
"pdf-lib": "^1.17.1" "pdf-lib": "^1.17.1"
} }
}, },
"packages/app-tests/node_modules/@types/node": {
"version": "20.8.4",
"dev": true,
"license": "MIT",
"dependencies": {
"undici-types": "~5.25.1"
}
},
"packages/app-tests/node_modules/undici-types": {
"version": "5.25.3",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz",
"integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==",
"dev": true
},
"packages/assets": { "packages/assets": {
"name": "@documenso/assets", "name": "@documenso/assets",
"version": "0.1.0" "version": "0.1.0"
@ -34239,7 +34181,7 @@
"eslint-plugin-package-json": "^0.10.4", "eslint-plugin-package-json": "^0.10.4",
"eslint-plugin-react": "^7.34.0", "eslint-plugin-react": "^7.34.0",
"eslint-plugin-unused-imports": "^3.1.0", "eslint-plugin-unused-imports": "^3.1.0",
"typescript": "5.2.2" "typescript": "5.6.2"
} }
}, },
"packages/eslint-config/node_modules/@eslint/eslintrc": { "packages/eslint-config/node_modules/@eslint/eslintrc": {
@ -35301,18 +35243,6 @@
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"packages/eslint-config/node_modules/typescript": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
"integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
},
"engines": {
"node": ">=14.17"
}
},
"packages/eslint-config/node_modules/which-typed-array": { "packages/eslint-config/node_modules/which-typed-array": {
"version": "1.1.14", "version": "1.1.14",
"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz",
@ -35445,9 +35375,10 @@
"devDependencies": { "devDependencies": {
"dotenv": "^16.3.1", "dotenv": "^16.3.1",
"dotenv-cli": "^7.3.0", "dotenv-cli": "^7.3.0",
"prisma-json-types-generator": "^3.2.2",
"prisma-kysely": "^1.8.0", "prisma-kysely": "^1.8.0",
"tsx": "^4.11.0", "tsx": "^4.11.0",
"typescript": "5.2.2", "typescript": "5.6.2",
"zod-prisma-types": "3.1.9" "zod-prisma-types": "3.1.9"
} }
}, },
@ -35468,23 +35399,54 @@
"@prisma/debug": "5.22.0" "@prisma/debug": "5.22.0"
} }
}, },
"packages/prisma/node_modules/prisma-json-types-generator": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/prisma-json-types-generator/-/prisma-json-types-generator-3.2.2.tgz",
"integrity": "sha512-kvEbJPIP5gxk65KmLs0nAvY+CxpqVMWb4OsEvXlyXZmp2IGfi5f52BUV7ezTYQNjRPZyR4QlayWJXffoqVVAfA==",
"dev": true,
"dependencies": {
"@prisma/generator-helper": "6.0.0",
"tslib": "2.8.1"
},
"bin": {
"prisma-json-types-generator": "index.js"
},
"engines": {
"node": ">=14.0"
},
"funding": {
"url": "https://github.com/arthurfiorette/prisma-json-types-generator?sponsor=1"
},
"peerDependencies": {
"prisma": "^5 || ^6",
"typescript": "^5.6.2"
}
},
"packages/prisma/node_modules/prisma-json-types-generator/node_modules/@prisma/debug": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-6.0.0.tgz",
"integrity": "sha512-eUjoNThlDXdyJ1iQ2d7U6aTVwm59EwvODb5zFVNJEokNoSiQmiYWNzZIwZyDmZ+j51j42/0iTaHIJ4/aZPKFRg==",
"dev": true
},
"packages/prisma/node_modules/prisma-json-types-generator/node_modules/@prisma/generator-helper": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/@prisma/generator-helper/-/generator-helper-6.0.0.tgz",
"integrity": "sha512-5DkG7hspZo6U4OtqI2W0JcgtY37sr7HgT8Q0W/sjL4VoV4px6ivzK6Eif5bKM7q+S4yFUHtjUt/3s69ErfLn7A==",
"dev": true,
"dependencies": {
"@prisma/debug": "6.0.0"
}
},
"packages/prisma/node_modules/ts-pattern": { "packages/prisma/node_modules/ts-pattern": {
"version": "5.0.6", "version": "5.0.6",
"resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-5.0.6.tgz", "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-5.0.6.tgz",
"integrity": "sha512-Y+jOjihlFriWzcBjncPCf2/am+Hgz7LtsWs77pWg5vQQKLQj07oNrJryo/wK2G0ndNaoVn2ownFMeoeAuReu3Q==" "integrity": "sha512-Y+jOjihlFriWzcBjncPCf2/am+Hgz7LtsWs77pWg5vQQKLQj07oNrJryo/wK2G0ndNaoVn2ownFMeoeAuReu3Q=="
}, },
"packages/prisma/node_modules/typescript": { "packages/prisma/node_modules/tslib": {
"version": "5.2.2", "version": "2.8.1",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
"integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
"dev": true, "dev": true
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
},
"engines": {
"node": ">=14.17"
}
}, },
"packages/prisma/node_modules/zod-prisma-types": { "packages/prisma/node_modules/zod-prisma-types": {
"version": "3.1.9", "version": "3.1.9",
@ -35639,7 +35601,7 @@
"@types/react": "^18", "@types/react": "^18",
"@types/react-dom": "^18", "@types/react-dom": "^18",
"react": "^18", "react": "^18",
"typescript": "5.2.2" "typescript": "5.6.2"
} }
}, },
"packages/ui/node_modules/react-pdf": { "packages/ui/node_modules/react-pdf": {
@ -35678,19 +35640,6 @@
"engines": { "engines": {
"node": ">=6" "node": ">=6"
} }
},
"packages/ui/node_modules/typescript": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
"integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
"dev": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
},
"engines": {
"node": ">=14.17"
}
} }
} }
} }

3
package.json
View File

@ -65,6 +65,7 @@
"dependencies": { "dependencies": {
"@documenso/pdf-sign": "^0.1.0", "@documenso/pdf-sign": "^0.1.0",
"@documenso/prisma": "^0.0.0", "@documenso/prisma": "^0.0.0",
"typescript": "5.6.2",
"@lingui/core": "^4.11.3", "@lingui/core": "^4.11.3",
"inngest-cli": "^0.29.1", "inngest-cli": "^0.29.1",
"luxon": "^3.5.0", "luxon": "^3.5.0",
@ -80,4 +81,4 @@
"trigger.dev": { "trigger.dev": {
"endpointId": "documenso-app" "endpointId": "documenso-app"
} }
} }

4
packages/api/v1/implementation.ts
View File

@ -1053,12 +1053,12 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
.with('TEXT', () => ZTextFieldMeta.safeParse(fieldMeta)) .with('TEXT', () => ZTextFieldMeta.safeParse(fieldMeta))
.with('SIGNATURE', 'INITIALS', 'DATE', 'EMAIL', 'NAME', () => ({ .with('SIGNATURE', 'INITIALS', 'DATE', 'EMAIL', 'NAME', () => ({
success: true, success: true,
data: {}, data: undefined,
})) }))
.with('FREE_SIGNATURE', () => ({ .with('FREE_SIGNATURE', () => ({
success: false, success: false,
error: 'FREE_SIGNATURE is not supported', error: 'FREE_SIGNATURE is not supported',
data: {}, data: undefined,
})) }))
.exhaustive(); .exhaustive();

2
packages/app-tests/e2e/templates/create-document-from-template.spec.ts
View File

@ -27,7 +27,7 @@ function createTempPdfFile() {
'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj 2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj 3 0 obj<</Type/Page/MediaBox[0 0 612 792]/Parent 2 0 R>>endobj\nxref\n0 4\n0000000000 65535 f\n0000000009 00000 n\n0000000052 00000 n\n0000000101 00000 n\ntrailer<</Size 4/Root 1 0 R>>\nstartxref\n178\n%%EOF', '%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj 2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj 3 0 obj<</Type/Page/MediaBox[0 0 612 792]/Parent 2 0 R>>endobj\nxref\n0 4\n0000000000 65535 f\n0000000009 00000 n\n0000000052 00000 n\n0000000101 00000 n\ntrailer<</Size 4/Root 1 0 R>>\nstartxref\n178\n%%EOF',
); );
fs.writeFileSync(tempFilePath, pdfContent); fs.writeFileSync(tempFilePath, new Uint8Array(pdfContent));
return tempFilePath; return tempFilePath;
} }

2
packages/app-tests/package.json
View File

@ -13,7 +13,7 @@
"author": "", "author": "",
"devDependencies": { "devDependencies": {
"@playwright/test": "^1.18.1", "@playwright/test": "^1.18.1",
"@types/node": "^20.8.2", "@types/node": "^20",
"@documenso/lib": "*", "@documenso/lib": "*",
"@documenso/prisma": "*", "@documenso/prisma": "*",
"@documenso/web": "*", "@documenso/web": "*",

4
packages/eslint-config/package.json
View File

@ -15,6 +15,6 @@
"eslint-plugin-package-json": "^0.10.4", "eslint-plugin-package-json": "^0.10.4",
"eslint-plugin-react": "^7.34.0", "eslint-plugin-react": "^7.34.0",
"eslint-plugin-unused-imports": "^3.1.0", "eslint-plugin-unused-imports": "^3.1.0",
"typescript": "5.2.2" "typescript": "5.6.2"
} }
} }

2
packages/lib/server-only/2fa/setup-2fa.ts
View File

@ -33,7 +33,7 @@ export const setupTwoFactorAuthentication = async ({
const accountName = user.email; const accountName = user.email;
const uri = createTOTPKeyURI(ISSUER, accountName, secret); const uri = createTOTPKeyURI(ISSUER, accountName, secret);
const encodedSecret = base32.encode(secret); const encodedSecret = base32.encode(new Uint8Array(secret));
await prisma.user.update({ await prisma.user.update({
where: { where: {

7
packages/lib/server-only/field/update-field.ts
View File

@ -65,11 +65,6 @@ export const updateField = async ({
}, },
}); });
const newFieldMeta = {
...(oldField.fieldMeta as FieldMeta),
...fieldMeta,
};
const field = prisma.$transaction(async (tx) => { const field = prisma.$transaction(async (tx) => {
const updatedField = await tx.field.update({ const updatedField = await tx.field.update({
where: { where: {
@ -83,7 +78,7 @@ export const updateField = async ({
positionY: pageY, positionY: pageY,
width: pageWidth, width: pageWidth,
height: pageHeight, height: pageHeight,
fieldMeta: newFieldMeta, fieldMeta,
}, },
include: { include: {
recipient: true, recipient: true,

8
packages/lib/types/document-form-values.ts Normal file
View File

@ -0,0 +1,8 @@
import { z } from 'zod';
export const ZDocumentFormValuesSchema = z.record(
z.string(),
z.union([z.string(), z.boolean(), z.number()]),
);
export type TDocumentFormValues = z.infer<typeof ZDocumentFormValuesSchema>;

59
packages/lib/types/field-meta.ts
View File

@ -9,36 +9,36 @@ export const ZBaseFieldMeta = z.object({
export type TBaseFieldMeta = z.infer<typeof ZBaseFieldMeta>; export type TBaseFieldMeta = z.infer<typeof ZBaseFieldMeta>;
export const ZInitialsFieldMeta = z.object({ export const ZInitialsFieldMeta = ZBaseFieldMeta.extend({
type: z.literal('initials').default('initials'), type: z.literal('initials'),
fontSize: z.number().min(8).max(96).optional(), fontSize: z.number().min(8).max(96).optional(),
}); });
export type TInitialsFieldMeta = z.infer<typeof ZInitialsFieldMeta>; export type TInitialsFieldMeta = z.infer<typeof ZInitialsFieldMeta>;
export const ZNameFieldMeta = z.object({ export const ZNameFieldMeta = ZBaseFieldMeta.extend({
type: z.literal('name').default('name'), type: z.literal('name'),
fontSize: z.number().min(8).max(96).optional(), fontSize: z.number().min(8).max(96).optional(),
}); });
export type TNameFieldMeta = z.infer<typeof ZNameFieldMeta>; export type TNameFieldMeta = z.infer<typeof ZNameFieldMeta>;
export const ZEmailFieldMeta = z.object({ export const ZEmailFieldMeta = ZBaseFieldMeta.extend({
type: z.literal('email').default('email'), type: z.literal('email'),
fontSize: z.number().min(8).max(96).optional(), fontSize: z.number().min(8).max(96).optional(),
}); });
export type TEmailFieldMeta = z.infer<typeof ZEmailFieldMeta>; export type TEmailFieldMeta = z.infer<typeof ZEmailFieldMeta>;
export const ZDateFieldMeta = z.object({ export const ZDateFieldMeta = ZBaseFieldMeta.extend({
type: z.literal('date').default('date'), type: z.literal('date'),
fontSize: z.number().min(8).max(96).optional(), fontSize: z.number().min(8).max(96).optional(),
}); });
export type TDateFieldMeta = z.infer<typeof ZDateFieldMeta>; export type TDateFieldMeta = z.infer<typeof ZDateFieldMeta>;
export const ZTextFieldMeta = ZBaseFieldMeta.extend({ export const ZTextFieldMeta = ZBaseFieldMeta.extend({
type: z.literal('text').default('text'), type: z.literal('text'),
text: z.string().optional(), text: z.string().optional(),
characterLimit: z.number().optional(), characterLimit: z.number().optional(),
fontSize: z.number().min(8).max(96).optional(), fontSize: z.number().min(8).max(96).optional(),
@ -47,7 +47,7 @@ export const ZTextFieldMeta = ZBaseFieldMeta.extend({
export type TTextFieldMeta = z.infer<typeof ZTextFieldMeta>; export type TTextFieldMeta = z.infer<typeof ZTextFieldMeta>;
export const ZNumberFieldMeta = ZBaseFieldMeta.extend({ export const ZNumberFieldMeta = ZBaseFieldMeta.extend({
type: z.literal('number').default('number'), type: z.literal('number'),
numberFormat: z.string().optional(), numberFormat: z.string().optional(),
value: z.string().optional(), value: z.string().optional(),
minValue: z.number().optional(), minValue: z.number().optional(),
@ -58,7 +58,7 @@ export const ZNumberFieldMeta = ZBaseFieldMeta.extend({
export type TNumberFieldMeta = z.infer<typeof ZNumberFieldMeta>; export type TNumberFieldMeta = z.infer<typeof ZNumberFieldMeta>;
export const ZRadioFieldMeta = ZBaseFieldMeta.extend({ export const ZRadioFieldMeta = ZBaseFieldMeta.extend({
type: z.literal('radio').default('radio'), type: z.literal('radio'),
values: z values: z
.array( .array(
z.object({ z.object({
@ -73,7 +73,7 @@ export const ZRadioFieldMeta = ZBaseFieldMeta.extend({
export type TRadioFieldMeta = z.infer<typeof ZRadioFieldMeta>; export type TRadioFieldMeta = z.infer<typeof ZRadioFieldMeta>;
export const ZCheckboxFieldMeta = ZBaseFieldMeta.extend({ export const ZCheckboxFieldMeta = ZBaseFieldMeta.extend({
type: z.literal('checkbox').default('checkbox'), type: z.literal('checkbox'),
values: z values: z
.array( .array(
z.object({ z.object({
@ -90,30 +90,27 @@ export const ZCheckboxFieldMeta = ZBaseFieldMeta.extend({
export type TCheckboxFieldMeta = z.infer<typeof ZCheckboxFieldMeta>; export type TCheckboxFieldMeta = z.infer<typeof ZCheckboxFieldMeta>;
export const ZDropdownFieldMeta = ZBaseFieldMeta.extend({ export const ZDropdownFieldMeta = ZBaseFieldMeta.extend({
type: z.literal('dropdown').default('dropdown'), type: z.literal('dropdown'),
values: z.array(z.object({ value: z.string() })).optional(), values: z.array(z.object({ value: z.string() })).optional(),
defaultValue: z.string().optional(), defaultValue: z.string().optional(),
}); });
export type TDropdownFieldMeta = z.infer<typeof ZDropdownFieldMeta>; export type TDropdownFieldMeta = z.infer<typeof ZDropdownFieldMeta>;
/** export const ZFieldMetaNotOptionalSchema = z.discriminatedUnion('type', [
* This will parse empty objects to { "type": "initials" } ZInitialsFieldMeta,
* ZNameFieldMeta,
* Todo: Fix. ZEmailFieldMeta,
*/ ZDateFieldMeta,
export const ZFieldMetaSchema = z ZTextFieldMeta,
.union([ ZNumberFieldMeta,
ZBaseFieldMeta.extend(ZInitialsFieldMeta.shape), ZRadioFieldMeta,
ZBaseFieldMeta.extend(ZNameFieldMeta.shape), ZCheckboxFieldMeta,
ZBaseFieldMeta.extend(ZEmailFieldMeta.shape), ZDropdownFieldMeta,
ZBaseFieldMeta.extend(ZDateFieldMeta.shape), ]);
ZTextFieldMeta,
ZNumberFieldMeta, export type TFieldMetaNotOptionalSchema = z.infer<typeof ZFieldMetaNotOptionalSchema>;
ZRadioFieldMeta,
ZCheckboxFieldMeta, export const ZFieldMetaSchema = ZFieldMetaNotOptionalSchema.optional();
ZDropdownFieldMeta,
])
.optional();
export type TFieldMetaSchema = z.infer<typeof ZFieldMetaSchema>; export type TFieldMetaSchema = z.infer<typeof ZFieldMetaSchema>;

1
packages/prisma/index.ts
View File

@ -1,3 +1,4 @@
/// <reference types="@documenso/prisma/types/types.d.ts" />
import { PrismaClient } from '@prisma/client'; import { PrismaClient } from '@prisma/client';
import { Kysely, PostgresAdapter, PostgresIntrospector, PostgresQueryCompiler } from 'kysely'; import { Kysely, PostgresAdapter, PostgresIntrospector, PostgresQueryCompiler } from 'kysely';
import kyselyExtension from 'prisma-extension-kysely'; import kyselyExtension from 'prisma-extension-kysely';

3
packages/prisma/package.json
View File

@ -30,9 +30,10 @@
"devDependencies": { "devDependencies": {
"dotenv": "^16.3.1", "dotenv": "^16.3.1",
"dotenv-cli": "^7.3.0", "dotenv-cli": "^7.3.0",
"prisma-json-types-generator": "^3.2.2",
"prisma-kysely": "^1.8.0", "prisma-kysely": "^1.8.0",
"tsx": "^4.11.0", "tsx": "^4.11.0",
"typescript": "5.2.2", "typescript": "5.6.2",
"zod-prisma-types": "3.1.9" "zod-prisma-types": "3.1.9"
} }
} }

24
packages/prisma/schema.prisma
View File

@ -6,6 +6,10 @@ generator client {
provider = "prisma-client-js" provider = "prisma-client-js"
} }
generator json {
provider = "prisma-json-types-generator"
}
generator zod { generator zod {
provider = "zod-prisma-types" provider = "zod-prisma-types"
createInputTypes = false createInputTypes = false
@ -297,14 +301,14 @@ enum DocumentVisibility {
ADMIN ADMIN
} }
/// @zod.import(["import { ZDocumentAuthOptionsSchema } from '@documenso/lib/types/document-auth';"]) /// @zod.import(["import { ZDocumentAuthOptionsSchema } from '@documenso/lib/types/document-auth';", "import { ZDocumentFormValuesSchema } from '@documenso/lib/types/document-form-values';"])
model Document { model Document {
id Int @id @default(autoincrement()) id Int @id @default(autoincrement())
externalId String? /// @zod.string.describe("A custom external ID you can use to identify the document.") externalId String? /// @zod.string.describe("A custom external ID you can use to identify the document.")
userId Int /// @zod.number.describe("The ID of the user that created this document.") userId Int /// @zod.number.describe("The ID of the user that created this document.")
user User @relation(fields: [userId], references: [id], onDelete: Cascade) user User @relation(fields: [userId], references: [id], onDelete: Cascade)
authOptions Json? /// Todo: zod.custom.use(ZDocumentAuthOptionsSchema.describe("Hello")) authOptions Json? /// [DocumentAuthOptions] @zod.custom.use(ZDocumentAuthOptionsSchema)
formValues Json? formValues Json? /// [DocumentFormValues] @zod.custom.use(ZDocumentFormValuesSchema)
visibility DocumentVisibility @default(EVERYONE) visibility DocumentVisibility @default(EVERYONE)
title String title String
status DocumentStatus @default(DRAFT) status DocumentStatus @default(DRAFT)
@ -373,6 +377,7 @@ enum DocumentDistributionMethod {
NONE NONE
} }
/// @zod.import(["import { ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';"])
model DocumentMeta { model DocumentMeta {
id String @id @default(cuid()) id String @id @default(cuid())
subject String? subject String?
@ -387,7 +392,7 @@ model DocumentMeta {
typedSignatureEnabled Boolean @default(true) typedSignatureEnabled Boolean @default(true)
language String @default("en") language String @default("en")
distributionMethod DocumentDistributionMethod @default(EMAIL) distributionMethod DocumentDistributionMethod @default(EMAIL)
emailSettings Json? emailSettings Json? /// [DocumentEmailSettings] @zod.custom.use(ZDocumentEmailSettingsSchema)
} }
enum ReadStatus { enum ReadStatus {
@ -424,7 +429,7 @@ model Recipient {
documentDeletedAt DateTime? documentDeletedAt DateTime?
expired DateTime? expired DateTime?
signedAt DateTime? signedAt DateTime?
authOptions Json? /// Todo: zod.custom.use(ZRecipientAuthOptionsSchema) authOptions Json? /// [RecipientAuthOptions] @zod.custom.use(ZRecipientAuthOptionsSchema)
signingOrder Int? /// @zod.number.describe("The order in which the recipient should sign the document. Only works if the document is set to sequential signing.") signingOrder Int? /// @zod.number.describe("The order in which the recipient should sign the document. Only works if the document is set to sequential signing.")
rejectionReason String? rejectionReason String?
role RecipientRole @default(SIGNER) role RecipientRole @default(SIGNER)
@ -457,6 +462,7 @@ enum FieldType {
DROPDOWN DROPDOWN
} }
/// @zod.import(["import { ZFieldMetaNotOptionalSchema } from '@documenso/lib/types/field-meta';"])
model Field { model Field {
id Int @id @default(autoincrement()) id Int @id @default(autoincrement())
secondaryId String @unique @default(cuid()) secondaryId String @unique @default(cuid())
@ -475,7 +481,7 @@ model Field {
template Template? @relation(fields: [templateId], references: [id], onDelete: Cascade) template Template? @relation(fields: [templateId], references: [id], onDelete: Cascade)
recipient Recipient @relation(fields: [recipientId], references: [id], onDelete: Cascade) recipient Recipient @relation(fields: [recipientId], references: [id], onDelete: Cascade)
signature Signature? signature Signature?
fieldMeta Json? // Todo: Fix ZFieldMetaSchema before using it here. fieldMeta Json? /// [FieldMeta] @zod.custom.use(ZFieldMetaNotOptionalSchema)
@@index([documentId]) @@index([documentId])
@@index([templateId]) @@index([templateId])
@ -640,6 +646,7 @@ enum TemplateType {
PRIVATE PRIVATE
} }
/// @zod.import(["import { ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';"])
model TemplateMeta { model TemplateMeta {
id String @id @default(cuid()) id String @id @default(cuid())
subject String? subject String?
@ -655,9 +662,10 @@ model TemplateMeta {
template Template @relation(fields: [templateId], references: [id], onDelete: Cascade) template Template @relation(fields: [templateId], references: [id], onDelete: Cascade)
redirectUrl String? redirectUrl String?
language String @default("en") language String @default("en")
emailSettings Json? emailSettings Json? /// [DocumentEmailSettings] @zod.custom.use(ZDocumentEmailSettingsSchema)
} }
/// @zod.import(["import { ZDocumentAuthOptionsSchema } from '@documenso/lib/types/document-auth';"])
model Template { model Template {
id Int @id @default(autoincrement()) id Int @id @default(autoincrement())
externalId String? externalId String?
@ -666,7 +674,7 @@ model Template {
userId Int userId Int
teamId Int? teamId Int?
visibility DocumentVisibility @default(EVERYONE) visibility DocumentVisibility @default(EVERYONE)
authOptions Json? authOptions Json? /// [DocumentAuthOptions] @zod.custom.use(ZDocumentAuthOptionsSchema)
templateMeta TemplateMeta? templateMeta TemplateMeta?
templateDocumentDataId String templateDocumentDataId String
createdAt DateTime @default(now()) createdAt DateTime @default(now())

25
packages/prisma/types/types.d.ts vendored Normal file
View File

@ -0,0 +1,25 @@
/* eslint-disable @typescript-eslint/no-namespace */
import type {
TDocumentAuthOptions,
TRecipientAuthOptions,
} from '@documenso/lib/types/document-auth';
import type { TDocumentEmailSettings } from '@documenso/lib/types/document-email';
import type { TDocumentFormValues } from '@documenso/lib/types/document-form-values';
import type { TFieldMetaNotOptionalSchema } from '@documenso/lib/types/field-meta';
/**
* Global types for Prisma.Json instances.
*/
declare global {
namespace PrismaJson {
type DocumentFormValues = TDocumentFormValues;
type DocumentAuthOptions = TDocumentAuthOptions;
type DocumentEmailSettings = TDocumentEmailSettings;
type RecipientAuthOptions = TRecipientAuthOptions;
type FieldMeta = TFieldMetaNotOptionalSchema;
}
}
export {};

6
packages/signing/helpers/update-signing-placeholder.ts
View File

@ -26,9 +26,9 @@ export const updateSigningPlaceholder = ({ pdf }: UpdateSigningPlaceholderOption
const newByteRange = `[${byteRange.join(' ')}]`.padEnd(byteRangeSlice.length, ' '); const newByteRange = `[${byteRange.join(' ')}]`.padEnd(byteRangeSlice.length, ' ');
const updatedPdf = Buffer.concat([ const updatedPdf = Buffer.concat([
pdf.subarray(0, byteRangeStart), new Uint8Array(pdf.subarray(0, byteRangeStart)),
Buffer.from(newByteRange), new Uint8Array(Buffer.from(newByteRange)),
pdf.subarray(byteRangeEnd + 1), new Uint8Array(pdf.subarray(byteRangeEnd + 1)),
]); ]);
if (updatedPdf.length !== length) { if (updatedPdf.length !== length) {

15
packages/signing/transports/google-cloud-hsm.ts
View File

@ -23,13 +23,14 @@ export const signWithGoogleCloudHSM = async ({ pdf }: SignWithGoogleCloudHSMOpti
process.env.NEXT_PRIVATE_SIGNING_GCLOUD_APPLICATION_CREDENTIALS_CONTENTS process.env.NEXT_PRIVATE_SIGNING_GCLOUD_APPLICATION_CREDENTIALS_CONTENTS
) { ) {
if (!fs.existsSync(process.env.GOOGLE_APPLICATION_CREDENTIALS)) { if (!fs.existsSync(process.env.GOOGLE_APPLICATION_CREDENTIALS)) {
fs.writeFileSync( const contents = new Uint8Array(
process.env.GOOGLE_APPLICATION_CREDENTIALS,
Buffer.from( Buffer.from(
process.env.NEXT_PRIVATE_SIGNING_GCLOUD_APPLICATION_CREDENTIALS_CONTENTS, process.env.NEXT_PRIVATE_SIGNING_GCLOUD_APPLICATION_CREDENTIALS_CONTENTS,
'base64', 'base64',
), ),
); );
fs.writeFileSync(process.env.GOOGLE_APPLICATION_CREDENTIALS, contents);
} }
} }
@ -38,8 +39,8 @@ export const signWithGoogleCloudHSM = async ({ pdf }: SignWithGoogleCloudHSMOpti
}); });
const pdfWithoutSignature = Buffer.concat([ const pdfWithoutSignature = Buffer.concat([
pdfWithPlaceholder.subarray(0, byteRange[1]), new Uint8Array(pdfWithPlaceholder.subarray(0, byteRange[1])),
pdfWithPlaceholder.subarray(byteRange[2]), new Uint8Array(pdfWithPlaceholder.subarray(byteRange[2])),
]); ]);
const signatureLength = byteRange[2] - byteRange[1]; const signatureLength = byteRange[2] - byteRange[1];
@ -70,9 +71,9 @@ export const signWithGoogleCloudHSM = async ({ pdf }: SignWithGoogleCloudHSMOpti
const signatureAsHex = signature.toString('hex'); const signatureAsHex = signature.toString('hex');
const signedPdf = Buffer.concat([ const signedPdf = Buffer.concat([
pdfWithPlaceholder.subarray(0, byteRange[1]), new Uint8Array(pdfWithPlaceholder.subarray(0, byteRange[1])),
Buffer.from(`<${signatureAsHex.padEnd(signatureLength - 2, '0')}>`), new Uint8Array(Buffer.from(`<${signatureAsHex.padEnd(signatureLength - 2, '0')}>`)),
pdfWithPlaceholder.subarray(byteRange[2]), new Uint8Array(pdfWithPlaceholder.subarray(byteRange[2])),
]); ]);
return signedPdf; return signedPdf;

10
packages/signing/transports/local-cert.ts
View File

@ -15,8 +15,8 @@ export const signWithLocalCert = async ({ pdf }: SignWithLocalCertOptions) => {
}); });
const pdfWithoutSignature = Buffer.concat([ const pdfWithoutSignature = Buffer.concat([
pdfWithPlaceholder.subarray(0, byteRange[1]), new Uint8Array(pdfWithPlaceholder.subarray(0, byteRange[1])),
pdfWithPlaceholder.subarray(byteRange[2]), new Uint8Array(pdfWithPlaceholder.subarray(byteRange[2])),
]); ]);
const signatureLength = byteRange[2] - byteRange[1]; const signatureLength = byteRange[2] - byteRange[1];
@ -51,9 +51,9 @@ export const signWithLocalCert = async ({ pdf }: SignWithLocalCertOptions) => {
const signatureAsHex = signature.toString('hex'); const signatureAsHex = signature.toString('hex');
const signedPdf = Buffer.concat([ const signedPdf = Buffer.concat([
pdfWithPlaceholder.subarray(0, byteRange[1]), new Uint8Array(pdfWithPlaceholder.subarray(0, byteRange[1])),
Buffer.from(`<${signatureAsHex.padEnd(signatureLength - 2, '0')}>`), new Uint8Array(Buffer.from(`<${signatureAsHex.padEnd(signatureLength - 2, '0')}>`)),
pdfWithPlaceholder.subarray(byteRange[2]), new Uint8Array(pdfWithPlaceholder.subarray(byteRange[2])),
]); ]);
return signedPdf; return signedPdf;

2
packages/ui/package.json
View File

@ -23,7 +23,7 @@
"@types/react": "^18", "@types/react": "^18",
"@types/react-dom": "^18", "@types/react-dom": "^18",
"react": "^18", "react": "^18",
"typescript": "5.2.2" "typescript": "5.6.2"
}, },
"dependencies": { "dependencies": {
"@documenso/lib": "*", "@documenso/lib": "*",