diff --git a/package.json b/package.json index c145395..7c4e62e 100644 --- a/package.json +++ b/package.json @@ -39,11 +39,17 @@ "*.ts": "eslint --fix" }, "dependencies": { + "@babel/generator": "7.26.0", + "@babel/parser": "^7.26.2", + "@babel/traverse": "7.25.9", + "@babel/types": "7.26.0", "@mrleebo/prisma-ast": "^0.12.0", "ts-morph": "^22.0.0" }, "devDependencies": { "@babel/core": "^7.20.12", + "@types/babel__generator": "^7.6.0", + "@types/babel__traverse": "^7.14.0", "@types/eslint": "^8.21.1", "@types/node": "^16.16.0", "@typescript-eslint/eslint-plugin": "^5.48.2", @@ -78,7 +84,7 @@ "release-it": "^15.6.0", "sentences-per-line": "^0.2.1", "should-semantic-release": "^0.1.0", - "typescript": "^5.0.0", + "typescript": "^5.6.3", "vitest": "^0.31.1", "yaml-eslint-parser": "^1.2.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1c4943a..3e63d59 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,12 +8,21 @@ importers: .: dependencies: + '@babel/generator': + specifier: 7.26.0 + version: 7.26.0 + '@babel/parser': + specifier: ^7.26.2 + version: 7.26.2 + '@babel/traverse': + specifier: 7.25.9 + version: 7.25.9 + '@babel/types': + specifier: 7.26.0 + version: 7.26.0 '@mrleebo/prisma-ast': specifier: ^0.12.0 version: 0.12.0 - '@prettier/sync': - specifier: 0.5.2 - version: 0.5.2(prettier@2.8.3) ts-morph: specifier: ^22.0.0 version: 22.0.0 @@ -21,6 +30,12 @@ importers: '@babel/core': specifier: ^7.20.12 version: 7.20.12 + '@types/babel__generator': + specifier: ^7.6.0 + version: 7.6.8 + '@types/babel__traverse': + specifier: ^7.14.0 + version: 7.20.6 '@types/eslint': specifier: ^8.21.1 version: 8.21.2 @@ -29,10 +44,10 @@ importers: version: 16.18.24 '@typescript-eslint/eslint-plugin': specifier: ^5.48.2 - version: 5.48.2(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.0.2))(eslint@8.32.0)(typescript@5.0.2) + version: 5.48.2(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.6.3))(eslint@8.32.0)(typescript@5.6.3) '@typescript-eslint/parser': specifier: ^5.48.2 - version: 5.48.2(eslint@8.32.0)(typescript@5.0.2) + version: 5.48.2(eslint@8.32.0)(typescript@5.6.3) '@typescript/vfs': specifier: 1.4.0 version: 1.4.0 @@ -50,13 +65,13 @@ importers: version: 8.6.0(eslint@8.32.0) eslint-plugin-deprecation: specifier: ^1.4.1 - version: 1.4.1(eslint@8.32.0)(typescript@5.0.2) + version: 1.4.1(eslint@8.32.0)(typescript@5.6.3) eslint-plugin-eslint-comments: specifier: ^3.2.0 version: 3.2.0(eslint@8.32.0) eslint-plugin-import: specifier: ^2.27.5 - version: 2.27.5(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.0.2))(eslint@8.32.0) + version: 2.27.5(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.6.3))(eslint@8.32.0) eslint-plugin-jsonc: specifier: ^2.6.0 version: 2.6.0(eslint@8.32.0) @@ -74,7 +89,7 @@ importers: version: 10.0.0(eslint@8.32.0) eslint-plugin-typescript-sort-keys: specifier: ^2.3.0 - version: 2.3.0(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.0.2))(eslint@8.32.0)(typescript@5.0.2) + version: 2.3.0(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.6.3))(eslint@8.32.0)(typescript@5.6.3) eslint-plugin-yml: specifier: ^1.5.0 version: 1.5.0(eslint@8.32.0) @@ -124,8 +139,8 @@ importers: specifier: ^0.1.0 version: 0.1.1 typescript: - specifier: ^5.0.0 - version: 5.0.2 + specifier: ^5.6.3 + version: 5.6.3 vitest: specifier: ^0.31.1 version: 0.31.1 @@ -143,6 +158,10 @@ packages: resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==} engines: {node: '>=6.9.0'} + '@babel/code-frame@7.26.2': + resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} + engines: {node: '>=6.9.0'} + '@babel/compat-data@7.20.10': resolution: {integrity: sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==} engines: {node: '>=6.9.0'} @@ -151,8 +170,8 @@ packages: resolution: {integrity: sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==} engines: {node: '>=6.9.0'} - '@babel/generator@7.20.7': - resolution: {integrity: sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==} + '@babel/generator@7.26.0': + resolution: {integrity: sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==} engines: {node: '>=6.9.0'} '@babel/helper-compilation-targets@7.20.7': @@ -165,14 +184,6 @@ packages: resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==} engines: {node: '>=6.9.0'} - '@babel/helper-function-name@7.19.0': - resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==} - engines: {node: '>=6.9.0'} - - '@babel/helper-hoist-variables@7.18.6': - resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==} - engines: {node: '>=6.9.0'} - '@babel/helper-module-imports@7.18.6': resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==} engines: {node: '>=6.9.0'} @@ -189,14 +200,18 @@ packages: resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==} engines: {node: '>=6.9.0'} - '@babel/helper-string-parser@7.19.4': - resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==} + '@babel/helper-string-parser@7.25.9': + resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==} engines: {node: '>=6.9.0'} '@babel/helper-validator-identifier@7.19.1': resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==} engines: {node: '>=6.9.0'} + '@babel/helper-validator-identifier@7.25.9': + resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} + engines: {node: '>=6.9.0'} + '@babel/helper-validator-option@7.18.6': resolution: {integrity: sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==} engines: {node: '>=6.9.0'} @@ -209,21 +224,21 @@ packages: resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==} engines: {node: '>=6.9.0'} - '@babel/parser@7.21.4': - resolution: {integrity: sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==} + '@babel/parser@7.26.2': + resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==} engines: {node: '>=6.0.0'} hasBin: true - '@babel/template@7.20.7': - resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==} + '@babel/template@7.25.9': + resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==} engines: {node: '>=6.9.0'} - '@babel/traverse@7.20.12': - resolution: {integrity: sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==} + '@babel/traverse@7.25.9': + resolution: {integrity: sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==} engines: {node: '>=6.9.0'} - '@babel/types@7.21.4': - resolution: {integrity: sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==} + '@babel/types@7.26.0': + resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==} engines: {node: '>=6.9.0'} '@chevrotain/cst-dts-gen@10.5.0': @@ -557,8 +572,8 @@ packages: resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==} engines: {node: '>=6.0.0'} - '@jridgewell/gen-mapping@0.3.2': - resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==} + '@jridgewell/gen-mapping@0.3.5': + resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} engines: {node: '>=6.0.0'} '@jridgewell/resolve-uri@3.1.0': @@ -569,12 +584,19 @@ packages: resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} engines: {node: '>=6.0.0'} + '@jridgewell/set-array@1.2.1': + resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} + engines: {node: '>=6.0.0'} + '@jridgewell/sourcemap-codec@1.4.14': resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} '@jridgewell/trace-mapping@0.3.17': resolution: {integrity: sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==} + '@jridgewell/trace-mapping@0.3.25': + resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} + '@mrleebo/prisma-ast@0.12.0': resolution: {integrity: sha512-qQsScED+KOMbnKP946Tiyi0Jzxq3YjvxkjD7MsR+SI815JLyoc2Ca6pi3t7ub8DJzO6kv3PC9Ly4ru7JufFnyQ==} engines: {node: '>=16'} @@ -763,11 +785,6 @@ packages: resolution: {integrity: sha512-/C0j7SsE9tGoj++f0dwePIV7zNZHcX8TcYL6pXNvZZCq4HsOMCBsIlcU9oMI/AGe+KMDfHFQSayWPO9QUuGE5w==} engines: {node: '>=14.6'} - '@prettier/sync@0.5.2': - resolution: {integrity: sha512-Yb569su456XNx5BsH/Vyem7xD6g/y9iLmLUzRKM1a/dhU/D7HqqvkAG72znulXlMXztbV0iiu9O5AL8K98TzZQ==} - peerDependencies: - prettier: '*' - '@sindresorhus/is@5.3.0': resolution: {integrity: sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==} engines: {node: '>=14.16'} @@ -788,6 +805,12 @@ packages: '@ts-morph/common@0.23.0': resolution: {integrity: sha512-m7Lllj9n/S6sOkCkRftpM7L24uvmfXQFedlW/4hENcuJH1HHm9u5EgxZb9uVjQSCGrbBWBkOGgcTxNg36r6ywA==} + '@types/babel__generator@7.6.8': + resolution: {integrity: sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==} + + '@types/babel__traverse@7.20.6': + resolution: {integrity: sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==} + '@types/chai-subset@1.3.3': resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==} @@ -2391,9 +2414,9 @@ packages: engines: {node: '>=10'} hasBin: true - jsesc@2.5.2: - resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} - engines: {node: '>=4'} + jsesc@3.0.2: + resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==} + engines: {node: '>=6'} hasBin: true json-buffer@3.0.1: @@ -2562,9 +2585,6 @@ packages: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} engines: {node: '>=8'} - make-synchronized@0.2.9: - resolution: {integrity: sha512-4wczOs8SLuEdpEvp3vGo83wh8rjJ78UsIk7DIX5fxdfmfMJGog4bQzxfvOwq7Q3yCHLC4jp1urPHIxRS/A93gA==} - map-age-cleaner@0.1.3: resolution: {integrity: sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==} engines: {node: '>=6'} @@ -3505,10 +3525,6 @@ packages: resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} engines: {node: '>=0.6.0'} - to-fast-properties@2.0.0: - resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} - engines: {node: '>=4'} - to-no-case@1.0.2: resolution: {integrity: sha512-Z3g735FxuZY8rodxV4gH7LxClE4H0hTIyHNIHdk+vpQxjLm0cwnKXq/OFVZ76SOQmto7txVcwSCwkU5kqp+FKg==} @@ -3604,9 +3620,9 @@ packages: typedarray-to-buffer@3.1.5: resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==} - typescript@5.0.2: - resolution: {integrity: sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==} - engines: {node: '>=12.20'} + typescript@5.6.3: + resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==} + engines: {node: '>=14.17'} hasBin: true uc.micro@1.0.6: @@ -3885,20 +3901,26 @@ snapshots: dependencies: '@babel/highlight': 7.18.6 + '@babel/code-frame@7.26.2': + dependencies: + '@babel/helper-validator-identifier': 7.25.9 + js-tokens: 4.0.0 + picocolors: 1.0.0 + '@babel/compat-data@7.20.10': {} '@babel/core@7.20.12': dependencies: '@ampproject/remapping': 2.2.0 '@babel/code-frame': 7.21.4 - '@babel/generator': 7.20.7 + '@babel/generator': 7.26.0 '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.20.12) '@babel/helper-module-transforms': 7.20.11 '@babel/helpers': 7.20.7 - '@babel/parser': 7.21.4 - '@babel/template': 7.20.7 - '@babel/traverse': 7.20.12 - '@babel/types': 7.21.4 + '@babel/parser': 7.26.2 + '@babel/template': 7.25.9 + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 convert-source-map: 1.9.0 debug: 4.3.4 gensync: 1.0.0-beta.2 @@ -3907,11 +3929,13 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/generator@7.20.7': + '@babel/generator@7.26.0': dependencies: - '@babel/types': 7.21.4 - '@jridgewell/gen-mapping': 0.3.2 - jsesc: 2.5.2 + '@babel/parser': 7.26.2 + '@babel/types': 7.26.0 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 + jsesc: 3.0.2 '@babel/helper-compilation-targets@7.20.7(@babel/core@7.20.12)': dependencies: @@ -3924,18 +3948,9 @@ snapshots: '@babel/helper-environment-visitor@7.18.9': {} - '@babel/helper-function-name@7.19.0': - dependencies: - '@babel/template': 7.20.7 - '@babel/types': 7.21.4 - - '@babel/helper-hoist-variables@7.18.6': - dependencies: - '@babel/types': 7.21.4 - '@babel/helper-module-imports@7.18.6': dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.26.0 '@babel/helper-module-transforms@7.20.11': dependencies: @@ -3944,31 +3959,33 @@ snapshots: '@babel/helper-simple-access': 7.20.2 '@babel/helper-split-export-declaration': 7.18.6 '@babel/helper-validator-identifier': 7.19.1 - '@babel/template': 7.20.7 - '@babel/traverse': 7.20.12 - '@babel/types': 7.21.4 + '@babel/template': 7.25.9 + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 transitivePeerDependencies: - supports-color '@babel/helper-simple-access@7.20.2': dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.26.0 '@babel/helper-split-export-declaration@7.18.6': dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.26.0 - '@babel/helper-string-parser@7.19.4': {} + '@babel/helper-string-parser@7.25.9': {} '@babel/helper-validator-identifier@7.19.1': {} + '@babel/helper-validator-identifier@7.25.9': {} + '@babel/helper-validator-option@7.18.6': {} '@babel/helpers@7.20.7': dependencies: - '@babel/template': 7.20.7 - '@babel/traverse': 7.20.12 - '@babel/types': 7.21.4 + '@babel/template': 7.25.9 + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 transitivePeerDependencies: - supports-color @@ -3978,36 +3995,32 @@ snapshots: chalk: 2.4.2 js-tokens: 4.0.0 - '@babel/parser@7.21.4': + '@babel/parser@7.26.2': dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.26.0 - '@babel/template@7.20.7': + '@babel/template@7.25.9': dependencies: - '@babel/code-frame': 7.21.4 - '@babel/parser': 7.21.4 - '@babel/types': 7.21.4 + '@babel/code-frame': 7.26.2 + '@babel/parser': 7.26.2 + '@babel/types': 7.26.0 - '@babel/traverse@7.20.12': + '@babel/traverse@7.25.9': dependencies: - '@babel/code-frame': 7.21.4 - '@babel/generator': 7.20.7 - '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-function-name': 7.19.0 - '@babel/helper-hoist-variables': 7.18.6 - '@babel/helper-split-export-declaration': 7.18.6 - '@babel/parser': 7.21.4 - '@babel/types': 7.21.4 + '@babel/code-frame': 7.26.2 + '@babel/generator': 7.26.0 + '@babel/parser': 7.26.2 + '@babel/template': 7.25.9 + '@babel/types': 7.26.0 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: - supports-color - '@babel/types@7.21.4': + '@babel/types@7.26.0': dependencies: - '@babel/helper-string-parser': 7.19.4 - '@babel/helper-validator-identifier': 7.19.1 - to-fast-properties: 2.0.0 + '@babel/helper-string-parser': 7.25.9 + '@babel/helper-validator-identifier': 7.25.9 '@chevrotain/cst-dts-gen@10.5.0': dependencies: @@ -4276,16 +4289,18 @@ snapshots: '@jridgewell/set-array': 1.1.2 '@jridgewell/sourcemap-codec': 1.4.14 - '@jridgewell/gen-mapping@0.3.2': + '@jridgewell/gen-mapping@0.3.5': dependencies: - '@jridgewell/set-array': 1.1.2 + '@jridgewell/set-array': 1.2.1 '@jridgewell/sourcemap-codec': 1.4.14 - '@jridgewell/trace-mapping': 0.3.17 + '@jridgewell/trace-mapping': 0.3.25 '@jridgewell/resolve-uri@3.1.0': {} '@jridgewell/set-array@1.1.2': {} + '@jridgewell/set-array@1.2.1': {} + '@jridgewell/sourcemap-codec@1.4.14': {} '@jridgewell/trace-mapping@0.3.17': @@ -4293,6 +4308,11 @@ snapshots: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.14 + '@jridgewell/trace-mapping@0.3.25': + dependencies: + '@jridgewell/resolve-uri': 3.1.0 + '@jridgewell/sourcemap-codec': 1.4.14 + '@mrleebo/prisma-ast@0.12.0': dependencies: chevrotain: 10.5.0 @@ -4553,11 +4573,6 @@ snapshots: write-file-atomic: 5.0.0 write-yaml-file: 4.2.0 - '@prettier/sync@0.5.2(prettier@2.8.3)': - dependencies: - make-synchronized: 0.2.9 - prettier: 2.8.3 - '@sindresorhus/is@5.3.0': {} '@snyk/github-codeowners@1.1.0': @@ -4579,6 +4594,14 @@ snapshots: mkdirp: 3.0.1 path-browserify: 1.0.1 + '@types/babel__generator@7.6.8': + dependencies: + '@babel/types': 7.26.0 + + '@types/babel__traverse@7.20.6': + dependencies: + '@babel/types': 7.26.0 + '@types/chai-subset@1.3.3': dependencies: '@types/chai': 4.3.5 @@ -4612,41 +4635,41 @@ snapshots: '@types/unist@2.0.6': {} - '@typescript-eslint/eslint-plugin@5.48.2(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.0.2))(eslint@8.32.0)(typescript@5.0.2)': + '@typescript-eslint/eslint-plugin@5.48.2(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.6.3))(eslint@8.32.0)(typescript@5.6.3)': dependencies: - '@typescript-eslint/parser': 5.48.2(eslint@8.32.0)(typescript@5.0.2) + '@typescript-eslint/parser': 5.48.2(eslint@8.32.0)(typescript@5.6.3) '@typescript-eslint/scope-manager': 5.48.2 - '@typescript-eslint/type-utils': 5.48.2(eslint@8.32.0)(typescript@5.0.2) - '@typescript-eslint/utils': 5.48.2(eslint@8.32.0)(typescript@5.0.2) + '@typescript-eslint/type-utils': 5.48.2(eslint@8.32.0)(typescript@5.6.3) + '@typescript-eslint/utils': 5.48.2(eslint@8.32.0)(typescript@5.6.3) debug: 4.3.4 eslint: 8.32.0 ignore: 5.2.4 natural-compare-lite: 1.4.0 regexpp: 3.2.0 semver: 7.3.8 - tsutils: 3.21.0(typescript@5.0.2) + tsutils: 3.21.0(typescript@5.6.3) optionalDependencies: - typescript: 5.0.2 + typescript: 5.6.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/experimental-utils@5.48.0(eslint@8.32.0)(typescript@5.0.2)': + '@typescript-eslint/experimental-utils@5.48.0(eslint@8.32.0)(typescript@5.6.3)': dependencies: - '@typescript-eslint/utils': 5.48.0(eslint@8.32.0)(typescript@5.0.2) + '@typescript-eslint/utils': 5.48.0(eslint@8.32.0)(typescript@5.6.3) eslint: 8.32.0 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.0.2)': + '@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.6.3)': dependencies: '@typescript-eslint/scope-manager': 5.48.2 '@typescript-eslint/types': 5.48.2 - '@typescript-eslint/typescript-estree': 5.48.2(typescript@5.0.2) + '@typescript-eslint/typescript-estree': 5.48.2(typescript@5.6.3) debug: 4.3.4 eslint: 8.32.0 optionalDependencies: - typescript: 5.0.2 + typescript: 5.6.3 transitivePeerDependencies: - supports-color @@ -4665,15 +4688,15 @@ snapshots: '@typescript-eslint/types': 5.59.0 '@typescript-eslint/visitor-keys': 5.59.0 - '@typescript-eslint/type-utils@5.48.2(eslint@8.32.0)(typescript@5.0.2)': + '@typescript-eslint/type-utils@5.48.2(eslint@8.32.0)(typescript@5.6.3)': dependencies: - '@typescript-eslint/typescript-estree': 5.48.2(typescript@5.0.2) - '@typescript-eslint/utils': 5.48.2(eslint@8.32.0)(typescript@5.0.2) + '@typescript-eslint/typescript-estree': 5.48.2(typescript@5.6.3) + '@typescript-eslint/utils': 5.48.2(eslint@8.32.0)(typescript@5.6.3) debug: 4.3.4 eslint: 8.32.0 - tsutils: 3.21.0(typescript@5.0.2) + tsutils: 3.21.0(typescript@5.6.3) optionalDependencies: - typescript: 5.0.2 + typescript: 5.6.3 transitivePeerDependencies: - supports-color @@ -4683,7 +4706,7 @@ snapshots: '@typescript-eslint/types@5.59.0': {} - '@typescript-eslint/typescript-estree@5.48.0(typescript@5.0.2)': + '@typescript-eslint/typescript-estree@5.48.0(typescript@5.6.3)': dependencies: '@typescript-eslint/types': 5.48.0 '@typescript-eslint/visitor-keys': 5.48.0 @@ -4691,13 +4714,13 @@ snapshots: globby: 11.1.0 is-glob: 4.0.3 semver: 7.3.8 - tsutils: 3.21.0(typescript@5.0.2) + tsutils: 3.21.0(typescript@5.6.3) optionalDependencies: - typescript: 5.0.2 + typescript: 5.6.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@5.48.2(typescript@5.0.2)': + '@typescript-eslint/typescript-estree@5.48.2(typescript@5.6.3)': dependencies: '@typescript-eslint/types': 5.48.2 '@typescript-eslint/visitor-keys': 5.48.2 @@ -4705,13 +4728,13 @@ snapshots: globby: 11.1.0 is-glob: 4.0.3 semver: 7.3.8 - tsutils: 3.21.0(typescript@5.0.2) + tsutils: 3.21.0(typescript@5.6.3) optionalDependencies: - typescript: 5.0.2 + typescript: 5.6.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@5.59.0(typescript@5.0.2)': + '@typescript-eslint/typescript-estree@5.59.0(typescript@5.6.3)': dependencies: '@typescript-eslint/types': 5.59.0 '@typescript-eslint/visitor-keys': 5.59.0 @@ -4719,19 +4742,19 @@ snapshots: globby: 11.1.0 is-glob: 4.0.3 semver: 7.3.8 - tsutils: 3.21.0(typescript@5.0.2) + tsutils: 3.21.0(typescript@5.6.3) optionalDependencies: - typescript: 5.0.2 + typescript: 5.6.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@5.48.0(eslint@8.32.0)(typescript@5.0.2)': + '@typescript-eslint/utils@5.48.0(eslint@8.32.0)(typescript@5.6.3)': dependencies: '@types/json-schema': 7.0.11 '@types/semver': 7.3.13 '@typescript-eslint/scope-manager': 5.48.0 '@typescript-eslint/types': 5.48.0 - '@typescript-eslint/typescript-estree': 5.48.0(typescript@5.0.2) + '@typescript-eslint/typescript-estree': 5.48.0(typescript@5.6.3) eslint: 8.32.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0(eslint@8.32.0) @@ -4740,13 +4763,13 @@ snapshots: - supports-color - typescript - '@typescript-eslint/utils@5.48.2(eslint@8.32.0)(typescript@5.0.2)': + '@typescript-eslint/utils@5.48.2(eslint@8.32.0)(typescript@5.6.3)': dependencies: '@types/json-schema': 7.0.11 '@types/semver': 7.3.13 '@typescript-eslint/scope-manager': 5.48.2 '@typescript-eslint/types': 5.48.2 - '@typescript-eslint/typescript-estree': 5.48.2(typescript@5.0.2) + '@typescript-eslint/typescript-estree': 5.48.2(typescript@5.6.3) eslint: 8.32.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0(eslint@8.32.0) @@ -4755,14 +4778,14 @@ snapshots: - supports-color - typescript - '@typescript-eslint/utils@5.59.0(eslint@8.32.0)(typescript@5.0.2)': + '@typescript-eslint/utils@5.59.0(eslint@8.32.0)(typescript@5.6.3)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.32.0) '@types/json-schema': 7.0.11 '@types/semver': 7.3.13 '@typescript-eslint/scope-manager': 5.59.0 '@typescript-eslint/types': 5.59.0 - '@typescript-eslint/typescript-estree': 5.59.0(typescript@5.0.2) + '@typescript-eslint/typescript-estree': 5.59.0(typescript@5.6.3) eslint: 8.32.0 eslint-scope: 5.1.1 semver: 7.3.8 @@ -5587,23 +5610,23 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.7.4(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.0.2))(eslint-import-resolver-node@0.3.7)(eslint@8.32.0): + eslint-module-utils@2.7.4(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.6.3))(eslint-import-resolver-node@0.3.7)(eslint@8.32.0): dependencies: debug: 3.2.7 optionalDependencies: - '@typescript-eslint/parser': 5.48.2(eslint@8.32.0)(typescript@5.0.2) + '@typescript-eslint/parser': 5.48.2(eslint@8.32.0)(typescript@5.6.3) eslint: 8.32.0 eslint-import-resolver-node: 0.3.7 transitivePeerDependencies: - supports-color - eslint-plugin-deprecation@1.4.1(eslint@8.32.0)(typescript@5.0.2): + eslint-plugin-deprecation@1.4.1(eslint@8.32.0)(typescript@5.6.3): dependencies: - '@typescript-eslint/utils': 5.59.0(eslint@8.32.0)(typescript@5.0.2) + '@typescript-eslint/utils': 5.59.0(eslint@8.32.0)(typescript@5.6.3) eslint: 8.32.0 tslib: 2.5.0 - tsutils: 3.21.0(typescript@5.0.2) - typescript: 5.0.2 + tsutils: 3.21.0(typescript@5.6.3) + typescript: 5.6.3 transitivePeerDependencies: - supports-color @@ -5613,7 +5636,7 @@ snapshots: eslint: 8.32.0 ignore: 5.2.4 - eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.0.2))(eslint@8.32.0): + eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.6.3))(eslint@8.32.0): dependencies: array-includes: 3.1.6 array.prototype.flat: 1.3.1 @@ -5622,7 +5645,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.32.0 eslint-import-resolver-node: 0.3.7 - eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.0.2))(eslint-import-resolver-node@0.3.7)(eslint@8.32.0) + eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.6.3))(eslint-import-resolver-node@0.3.7)(eslint@8.32.0) has: 1.0.3 is-core-module: 2.11.0 is-glob: 4.0.3 @@ -5632,7 +5655,7 @@ snapshots: semver: 6.3.0 tsconfig-paths: 3.14.1 optionalDependencies: - '@typescript-eslint/parser': 5.48.2(eslint@8.32.0)(typescript@5.0.2) + '@typescript-eslint/parser': 5.48.2(eslint@8.32.0)(typescript@5.6.3) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -5670,14 +5693,14 @@ snapshots: dependencies: eslint: 8.32.0 - eslint-plugin-typescript-sort-keys@2.3.0(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.0.2))(eslint@8.32.0)(typescript@5.0.2): + eslint-plugin-typescript-sort-keys@2.3.0(@typescript-eslint/parser@5.48.2(eslint@8.32.0)(typescript@5.6.3))(eslint@8.32.0)(typescript@5.6.3): dependencies: - '@typescript-eslint/experimental-utils': 5.48.0(eslint@8.32.0)(typescript@5.0.2) - '@typescript-eslint/parser': 5.48.2(eslint@8.32.0)(typescript@5.0.2) + '@typescript-eslint/experimental-utils': 5.48.0(eslint@8.32.0)(typescript@5.6.3) + '@typescript-eslint/parser': 5.48.2(eslint@8.32.0)(typescript@5.6.3) eslint: 8.32.0 json-schema: 0.4.0 natural-compare-lite: 1.4.0 - typescript: 5.0.2 + typescript: 5.6.3 transitivePeerDependencies: - supports-color @@ -6398,7 +6421,7 @@ snapshots: jsdoctypeparser@9.0.0: {} - jsesc@2.5.2: {} + jsesc@3.0.2: {} json-buffer@3.0.1: {} @@ -6463,7 +6486,7 @@ snapshots: pretty-ms: 8.0.0 strip-json-comments: 5.0.0 summary: 2.1.0 - typescript: 5.0.2 + typescript: 5.6.3 zod: 3.21.4 zod-validation-error: 1.2.1(zod@3.21.4) @@ -6586,8 +6609,6 @@ snapshots: dependencies: semver: 6.3.0 - make-synchronized@0.2.9: {} - map-age-cleaner@0.1.3: dependencies: p-defer: 1.0.0 @@ -7611,8 +7632,6 @@ snapshots: dependencies: os-tmpdir: 1.0.2 - to-fast-properties@2.0.0: {} - to-no-case@1.0.2: {} to-pascal-case@1.0.0: @@ -7653,10 +7672,10 @@ snapshots: tslib@2.5.0: {} - tsutils@3.21.0(typescript@5.0.2): + tsutils@3.21.0(typescript@5.6.3): dependencies: tslib: 1.14.1 - typescript: 5.0.2 + typescript: 5.6.3 type-check@0.3.2: dependencies: @@ -7694,7 +7713,7 @@ snapshots: dependencies: is-typedarray: 1.0.0 - typescript@5.0.2: {} + typescript@5.6.3: {} uc.micro@1.0.6: {} diff --git a/src/formatDTS.ts b/src/formatDTS.ts deleted file mode 100644 index 3adf0ca..0000000 --- a/src/formatDTS.ts +++ /dev/null @@ -1,18 +0,0 @@ -// https://prettier.io/docs/en/api.html - -let hasPrettierInstalled = false -try { - hasPrettierInstalled = !!require.resolve("prettier") -} catch (error) {} - -export const formatDTS = async (path: string, content: string): Promise => { - if (!hasPrettierInstalled) return content - - try { - const prettier = await import("prettier") - if (!prettier) return content - return prettier.format(content, { filepath: path }) - } catch (error) { - return content - } -} diff --git a/src/index.ts b/src/index.ts index 4d618f4..ae08066 100644 --- a/src/index.ts +++ b/src/index.ts @@ -14,6 +14,8 @@ export * from "./types.js" import { basename, join } from "node:path" +import { makeStep } from "./utils.js" + export interface SDLCodeGenReturn { // Optional way to start up a watcher mode for the codegen createWatcher: () => { fileChanged: (path: string) => Promise } @@ -22,7 +24,10 @@ export interface SDLCodeGenReturn { } /** The API specifically for the Redwood preset */ -export async function runFullCodegen(preset: "redwood", config: { paths: RedwoodPaths; verbose?: true }): Promise +export async function runFullCodegen( + preset: "redwood", + config: { paths: RedwoodPaths; sys?: typescript.System; verbose?: true } +): Promise export async function runFullCodegen(preset: string, config: unknown): Promise @@ -84,15 +89,15 @@ export async function runFullCodegen(preset: string, config: unknown): Promise { - const sharedDTSes = await createSharedSchemaFiles(appContext) + const sharedDTSes = await createSharedSchemaFiles(appContext, verbose) filepaths.push(...sharedDTSes) }) let knownServiceFiles: string[] = [] const createDTSFilesForAllServices = async () => { - // TODO: Maybe Redwood has an API for this? Its grabbing all the services const serviceFiles = appContext.sys.readDirectory(appContext.pathSettings.apiServicesPath) knownServiceFiles = serviceFiles.filter(isRedwoodServiceFile) + for (const path of knownServiceFiles) { const dts = await lookAtServiceFile(path, appContext) if (dts) filepaths.push(dts) @@ -118,7 +123,7 @@ export async function runFullCodegen(preset: string, config: unknown): Promise getGraphQLSDLFromFile(appContext.pathSettings)) - await step("Create all shared schema files", () => createSharedSchemaFiles(appContext)) + await step("Create all shared schema files", () => createSharedSchemaFiles(appContext, verbose)) await step("Create all service files", createDTSFilesForAllServices) } else if (path === appContext.pathSettings.prismaDSLPath) { await step("Prisma schema changed", () => getPrismaSchemaFromFile(appContext.pathSettings)) @@ -149,11 +154,3 @@ const isRedwoodServiceFile = (file: string) => { if (file.endsWith("scenarios.ts") || file.endsWith("scenarios.js")) return false return file.endsWith(".ts") || file.endsWith(".tsx") || file.endsWith(".js") } - -const makeStep = (verbose: boolean) => async (msg: string, fn: () => Promise | Promise | void) => { - if (!verbose) return fn() - console.log("[sdl-codegen] " + msg) - console.time("[sdl-codegen] " + msg) - await fn() - console.timeEnd("[sdl-codegen] " + msg) -} diff --git a/src/serviceFile.ts b/src/serviceFile.ts index f3718ae..156cfa9 100644 --- a/src/serviceFile.ts +++ b/src/serviceFile.ts @@ -1,10 +1,11 @@ /* eslint-disable @typescript-eslint/no-unnecessary-condition */ +import t, { tsTypeAnnotation } from "@babel/types" import * as graphql from "graphql" import { AppContext } from "./context.js" -import { formatDTS } from "./formatDTS.js" import { getCodeFactsForJSTSFileAtPath } from "./serviceFile.codefacts.js" +import { builder, TSBuilder } from "./tsBuilder.js" import { CodeFacts, ModelResolverFacts, ResolverFuncFact } from "./typeFacts.js" import { TypeMapper, typeMapper } from "./typeMap.js" import { capitalizeFirstLetter, createAndReferOrInlineArgsForField, inlineArgsForField } from "./utils.js" @@ -21,6 +22,7 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { const thisFact: CodeFacts = {} const filename = context.basename(file) + const dts = builder("", {}) // eslint-disable-next-line @typescript-eslint/no-non-null-assertion const queryType = gql.getQueryType()! @@ -28,7 +30,6 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion const mutationType = gql.getMutationType()! - if (!mutationType) throw new Error("No mutation type") const externalMapper = typeMapper(context, { preferPrismaModels: true }) @@ -42,9 +43,6 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { const extraPrismaReferences = new Set() const extraSharedFileImportReferences = new Set<{ import: string; name?: string }>() - // The file we'll be creating in-memory throughout this fn - const fileDTS = context.tsProject.createSourceFile(`source/${fileKey}.d.ts`, "", { overwrite: true }) - // Basically if a top level resolver reference Query or Mutation const knownSpecialCasesForGraphQL = new Set() @@ -56,10 +54,10 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { const isMutation = v.name in mutationType.getFields() const parentName = isQuery ? queryType.name : isMutation ? mutationType.name : undefined if (parentName) { - addDefinitionsForTopLevelResolvers(parentName, v) + addDefinitionsForTopLevelResolvers(parentName, v, dts) } else { // Add warning about unused resolver - fileDTS.addStatements(`\n// ${v.name} does not exist on Query or Mutation`) + dts.rootScope.addInterface(v.name, [], { exported: true, docs: "This resolver does not exist on Query or Mutation" }) } }) @@ -78,13 +76,9 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { const sharedInternalGraphQLObjectsReferenced = returnTypeMapper.getReferencedGraphQLThingsInMapping() const aliases = [...new Set([...sharedGraphQLObjectsReferenced.scalars, ...sharedInternalGraphQLObjectsReferenced.scalars])] - if (aliases.length) { - fileDTS.addTypeAliases( - aliases.map((s) => ({ - name: s, - type: "any", - })) - ) + + for (const alias of aliases) { + dts.rootScope.addTypeAlias(alias, "any") } const prismases = [ @@ -97,34 +91,22 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { const validPrismaObjs = prismases.filter((p) => prisma.has(p)) if (validPrismaObjs.length) { - fileDTS.addImportDeclaration({ - isTypeOnly: true, - moduleSpecifier: "@prisma/client", - namedImports: validPrismaObjs.map((p) => `${p} as P${p}`), - }) + dts.setImport("@prisma/client", { subImports: validPrismaObjs.map((p) => `${p} as P${p}`) }) } - if (fileDTS.getText().includes("GraphQLResolveInfo")) { - fileDTS.addImportDeclaration({ - isTypeOnly: true, - moduleSpecifier: "graphql", - namedImports: ["GraphQLResolveInfo"], - }) + const initialResult = dts.getResult() + if (initialResult.includes("GraphQLResolveInfo")) { + dts.setImport("graphql", { subImports: ["GraphQLResolveInfo"] }) } - if (fileDTS.getText().includes("RedwoodGraphQLContext")) { - fileDTS.addImportDeclaration({ - isTypeOnly: true, - moduleSpecifier: "@redwoodjs/graphql-server/dist/types", - namedImports: ["RedwoodGraphQLContext"], - }) + if (initialResult.includes("RedwoodGraphQLContext")) { + dts.setImport("@redwoodjs/graphql-server/dist/types", { subImports: ["RedwoodGraphQLContext"] }) } if (sharedInternalGraphQLObjectsReferenced.types.length || extraSharedFileImportReferences.size) { - fileDTS.addImportDeclaration({ - isTypeOnly: true, - moduleSpecifier: `./${settings.sharedInternalFilename.replace(".d.ts", "")}`, - namedImports: [ + const source = `./${settings.sharedInternalFilename.replace(".d.ts", "")}` + dts.setImport(source, { + subImports: [ ...sharedInternalGraphQLObjectsReferenced.types.map((t) => `${t} as RT${t}`), ...[...extraSharedFileImportReferences.values()].map((t) => ("name" in t && t.name ? `${t.import} as ${t.name}` : t.import)), ], @@ -132,11 +114,8 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { } if (sharedGraphQLObjectsReferencedTypes.length) { - fileDTS.addImportDeclaration({ - isTypeOnly: true, - moduleSpecifier: `./${settings.sharedFilename.replace(".d.ts", "")}`, - namedImports: sharedGraphQLObjectsReferencedTypes, - }) + const source = `./${settings.sharedFilename.replace(".d.ts", "")}` + dts.setImport(source, { subImports: sharedGraphQLObjectsReferencedTypes }) } serviceFacts.set(fileKey, thisFact) @@ -145,15 +124,12 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { const dtsFilepath = context.join(context.pathSettings.typesFolderRoot, dtsFilename) // Some manual formatting tweaks so we align with Redwood's setup more - const dts = fileDTS - .getText() - .replace(`from "graphql";`, `from "graphql";\n`) - .replace(`from "@redwoodjs/graphql-server/dist/types";`, `from "@redwoodjs/graphql-server/dist/types";\n`) + const final = dts.getResult() - const shouldWriteDTS = !!dts.trim().length + const shouldWriteDTS = !!final.trim().length if (!shouldWriteDTS) return - const formatted = await formatDTS(dtsFilepath, dts) + const formatted = final // await formatDTS(dtsFilepath, dts) // Don't make a file write if the content is the same const priorContent = context.sys.readFile(dtsFilename) @@ -162,24 +138,21 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { context.sys.writeFile(dtsFilepath, formatted) return dtsFilepath - function addDefinitionsForTopLevelResolvers(parentName: string, config: ResolverFuncFact) { + function addDefinitionsForTopLevelResolvers(parentName: string, config: ResolverFuncFact, dts: TSBuilder) { const { name } = config let field = queryType.getFields()[name] if (!field) { field = mutationType.getFields()[name] } - const interfaceDeclaration = fileDTS.addInterface({ - name: `${capitalizeFirstLetter(config.name)}Resolver`, - isExported: true, - docs: field.astNode - ? ["SDL: " + graphql.print(field.astNode)] - : ["@deprecated: Could not find this field in the schema for Mutation or Query"], - }) + const nodeDocs = field.astNode + ? ["SDL: " + graphql.print(field.astNode)] + : ["@deprecated: Could not find this field in the schema for Mutation or Query"] + const interfaceName = `${capitalizeFirstLetter(config.name)}Resolver` const args = createAndReferOrInlineArgsForField(field, { - name: interfaceDeclaration.getName(), - file: fileDTS, + name: interfaceName, + dts, mapper: externalMapper.map, }) @@ -190,17 +163,28 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { const qForInfos = config.infoParamType === "just_root_destructured" ? "?" : "" const returnType = returnTypeForResolver(returnTypeMapper, field, config) - interfaceDeclaration.addCallSignature({ - parameters: [ - { name: "args", type: argsParam, hasQuestionToken: config.funcArgCount < 1 }, + dts.rootScope.addInterface( + interfaceName, + [ { - name: "obj", - type: `{ root: ${parentName}, context${qForInfos}: RedwoodGraphQLContext, info${qForInfos}: GraphQLResolveInfo }`, - hasQuestionToken: config.funcArgCount < 2, + type: "call-signature", + optional: config.funcArgCount < 1, + returnType, + params: [ + { name: "args", type: argsParam, optional: config.funcArgCount < 1 }, + { + name: "obj", + type: `{ root: ${parentName}, context${qForInfos}: RedwoodGraphQLContext, info${qForInfos}: GraphQLResolveInfo }`, + optional: config.funcArgCount < 2, + }, + ], }, ], - returnType, - }) + { + exported: true, + docs: nodeDocs.join(" "), + } + ) } /** Ideally, we want to be able to write the type for just the object */ @@ -213,7 +197,7 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { const gqlType = gql.getType(modelName) if (!gqlType) { // throw new Error(`Could not find a GraphQL type named ${d.getName()}`); - fileDTS.addStatements(`\n// ${modelName} does not exist in the schema`) + // fileDTS.addStatements(`\n// ${modelName} does not exist in the schema`) return } @@ -228,11 +212,9 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { const hasGenerics = modelFacts.hasGenericArg - // This is what they would have to write - const resolverInterface = fileDTS.addInterface({ - name: `${modelName}TypeResolvers`, - typeParameters: hasGenerics ? ["Extended"] : [], - isExported: true, + const resolverInterface = dts.rootScope.addInterface(`${modelName}TypeResolvers`, [], { + exported: true, + generics: hasGenerics ? [{ name: "Extended" }] : [], }) // Handle extending classes in the runtime which only exist in SDL @@ -240,13 +222,19 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { if (!parentIsPrisma) extraSharedFileImportReferences.add({ name: `S${modelName}`, import: modelName }) const suffix = parentIsPrisma ? "P" : "S" - // The parent type for the resolvers - fileDTS.addTypeAlias({ - name: `${modelName}AsParent`, - typeParameters: hasGenerics ? ["Extended"] : [], - type: `${suffix}${modelName} ${createParentAdditionallyDefinedFunctions()} ${hasGenerics ? " & Extended" : ""}`, - }) + const parentTypeString = `${suffix}${modelName} ${createParentAdditionallyDefinedFunctions()} ${hasGenerics ? " & Extended" : ""}` + /** + type CurrentUserAccountAsParent = SCurrentUserAccount & { + users: () => PUser[] | Promise | (() => Promise); + registeredPublishingPartner: () => Promise; + subIsViaGift: () => boolean | Promise | (() => Promise); + } + */ + + dts.rootScope.addTypeAlias(`${modelName}AsParent`, t.tsTypeReference(t.identifier(parentTypeString)), { + generics: hasGenerics ? [{ name: "Extended" }] : [], + }) const modelFieldFacts = fieldFacts.get(modelName) ?? {} // Loop through the resolvers, adding the fields which have resolvers implemented in the source file @@ -265,21 +253,18 @@ export const lookAtServiceFile = async (file: string, context: AppContext) => { const qForInfos = resolver.infoParamType === "just_root_destructured" ? "?" : "" const innerArgs = `args${firstQ}: ${argsType}, obj${secondQ}: { root: ${modelName}AsParent${param}, context${qForInfos}: RedwoodGraphQLContext, info${qForInfos}: GraphQLResolveInfo }` - const returnType = returnTypeForResolver(returnTypeMapper, field, resolver) + const args = resolver.isFunc || resolver.isUnknown ? `(${innerArgs}) => ${returnType ?? "any"}` : returnType + + const docs = field.astNode ? `SDL: ${graphql.print(field.astNode)}` : "" + const property = t.tsPropertySignature(t.identifier(fieldName), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(args)))) + t.addComment(property, "leading", " " + docs) - const docs = field.astNode ? [`SDL: ${graphql.print(field.astNode)}`] : [] - // For speed we should switch this out to addProperties eventually - resolverInterface.addProperty({ - name: fieldName, - leadingTrivia: "\n", - docs, - type: resolver.isFunc || resolver.isUnknown ? `(${innerArgs}) => ${returnType ?? "any"}` : returnType, - }) + resolverInterface.body.body.push(property) } else { - resolverInterface.addCallSignature({ - docs: [` @deprecated: SDL ${modelName}.${resolver.name} does not exist in your schema`], - }) + resolverInterface.body.body.push( + t.tsPropertySignature(t.identifier(resolver.name), t.tsTypeAnnotation(t.tsTypeReference(t.identifier("void")))) + ) } }) diff --git a/src/sharedSchema.ts b/src/sharedSchema.ts index 1821a5a..abb6aaf 100644 --- a/src/sharedSchema.ts +++ b/src/sharedSchema.ts @@ -1,15 +1,17 @@ /// The main schema for objects and inputs +import t from "@babel/types" import * as graphql from "graphql" -import * as tsMorph from "ts-morph" import { AppContext } from "./context.js" -import { formatDTS } from "./formatDTS.js" +import { builder } from "./tsBuilder.js" import { typeMapper } from "./typeMap.js" +import { makeStep } from "./utils.js" -export const createSharedSchemaFiles = async (context: AppContext) => { - await createSharedExternalSchemaFile(context) - await createSharedReturnPositionSchemaFile(context) +export const createSharedSchemaFiles = async (context: AppContext, verbose: boolean) => { + const step = makeStep(verbose) + await step("Creating shared schema files", () => createSharedExternalSchemaFile(context)) + await step("Creating shared return position schema files", () => createSharedReturnPositionSchemaFile(context)) return [ context.join(context.pathSettings.typesFolderRoot, context.pathSettings.sharedFilename), @@ -17,7 +19,7 @@ export const createSharedSchemaFiles = async (context: AppContext) => { ] } -async function createSharedExternalSchemaFile(context: AppContext) { +function createSharedExternalSchemaFile(context: AppContext) { const gql = context.gql const types = gql.getTypeMap() const knownPrimitives = ["String", "Boolean", "Int"] @@ -25,7 +27,8 @@ async function createSharedExternalSchemaFile(context: AppContext) { const { prisma, fieldFacts } = context const mapper = typeMapper(context, {}) - const externalTSFile = context.tsProject.createSourceFile(`/source/${context.pathSettings.sharedFilename}`, "") + const priorFile = "" + const dts = builder(priorFile, {}) Object.keys(types).forEach((name) => { if (name.startsWith("__")) { @@ -50,86 +53,68 @@ async function createSharedExternalSchemaFile(context: AppContext) { docs.push(type.description) } - externalTSFile.addInterface({ - name: type.name, - isExported: true, - docs: [], - properties: [ + dts.rootScope.addInterface( + type.name, + [ { name: "__typename", type: `"${type.name}"`, - hasQuestionToken: true, + optional: true, }, ...Object.entries(type.getFields()).map(([fieldName, obj]: [string, graphql.GraphQLField]) => { - const docs = [] const prismaField = pType?.properties.get(fieldName) const type = obj.type as graphql.GraphQLType - if (prismaField?.leadingComments.length) { - docs.push(prismaField.leadingComments.trim()) - } - // if (obj.description) docs.push(obj.description); const hasResolverImplementation = fieldFacts.get(name)?.[fieldName]?.hasResolverImplementation const isOptionalInSDL = !graphql.isNonNullType(type) const doesNotExistInPrisma = false // !prismaField; - const field: tsMorph.OptionalKind = { + const field = { name: fieldName, - type: mapper.map(type, { preferNullOverUndefined: true }), - docs, - hasQuestionToken: hasResolverImplementation ?? (isOptionalInSDL || doesNotExistInPrisma), + type: mapper.map(type, { preferNullOverUndefined: true })!, + docs: prismaField?.leadingComments.trim(), + optional: hasResolverImplementation ?? (isOptionalInSDL || doesNotExistInPrisma), } return field }), ], - }) + { exported: true, docs: docs.join(" ") } + ) } if (graphql.isEnumType(type)) { - externalTSFile.addTypeAlias({ - name: type.name, - isExported: true, - type: - '"' + - type - .getValues() - .map((m) => (m as { value: string }).value) - .join('" | "') + - '"', - }) + const union = + '"' + + type + .getValues() + .map((m) => (m as { value: string }).value) + .join('" | "') + + '"' + dts.rootScope.addTypeAlias(type.name, t.tsTypeReference(t.identifier(union)), { exported: true }) } if (graphql.isUnionType(type)) { - externalTSFile.addTypeAlias({ - name: type.name, - isExported: true, - type: type - .getTypes() - .map((m) => m.name) - .join(" | "), - }) + const union = type + .getTypes() + .map((m) => m.name) + .join(" | ") + dts.rootScope.addTypeAlias(type.name, t.tsTypeReference(t.identifier(union)), { exported: true }) } }) const { scalars } = mapper.getReferencedGraphQLThingsInMapping() - if (scalars.length) { - externalTSFile.addTypeAliases( - scalars.map((s) => ({ - name: s, - type: "any", - })) - ) + for (const s of scalars) { + dts.rootScope.addTypeAlias(s, t.tsAnyKeyword()) } + const text = dts.getResult() const fullPath = context.join(context.pathSettings.typesFolderRoot, context.pathSettings.sharedFilename) - const formatted = await formatDTS(fullPath, externalTSFile.getText()) - const prior = context.sys.readFile(fullPath) - if (prior !== formatted) context.sys.writeFile(fullPath, formatted) + if (prior !== text) context.sys.writeFile(fullPath, text) } -async function createSharedReturnPositionSchemaFile(context: AppContext) { +function createSharedReturnPositionSchemaFile(context: AppContext) { const { gql, prisma, fieldFacts } = context const types = gql.getTypeMap() const mapper = typeMapper(context, { preferPrismaModels: true }) @@ -137,10 +122,9 @@ async function createSharedReturnPositionSchemaFile(context: AppContext) { const typesToImport = [] as string[] const knownPrimitives = ["String", "Boolean", "Int"] - const externalTSFile = context.tsProject.createSourceFile( - `/source/${context.pathSettings.sharedInternalFilename}`, - ` -// You may very reasonably ask yourself, 'what is this file?' and why do I need it. + const dts = builder("", {}) + + dts.rootScope.addLeadingComment(`// You may very reasonably ask yourself, 'what is this file?' and why do I need it. // Roughly, this file ensures that when a resolver wants to return a type - that // type will match a prisma model. This is useful because you can trivially extend @@ -149,9 +133,7 @@ async function createSharedReturnPositionSchemaFile(context: AppContext) { // This gets particularly valuable when you want to return a union type, an interface, // or a model where the prisma model is nested pretty deeply (GraphQL connections, for example.) - -` - ) +`) Object.keys(types).forEach((name) => { if (name.startsWith("__")) { @@ -173,88 +155,67 @@ async function createSharedReturnPositionSchemaFile(context: AppContext) { return } - externalTSFile.addInterface({ - name: type.name, - isExported: true, - docs: [], - properties: [ + dts.rootScope.addInterface( + type.name, + [ { name: "__typename", type: `"${type.name}"`, - hasQuestionToken: true, + optional: true, }, ...Object.entries(type.getFields()).map(([fieldName, obj]: [string, graphql.GraphQLField]) => { const hasResolverImplementation = fieldFacts.get(name)?.[fieldName]?.hasResolverImplementation const isOptionalInSDL = !graphql.isNonNullType(obj.type) const doesNotExistInPrisma = false // !prismaField; - const field: tsMorph.OptionalKind = { + const field = { name: fieldName, - type: mapper.map(obj.type, { preferNullOverUndefined: true }), - hasQuestionToken: hasResolverImplementation ?? (isOptionalInSDL || doesNotExistInPrisma), + type: mapper.map(obj.type, { preferNullOverUndefined: true })!, + optional: hasResolverImplementation ?? (isOptionalInSDL || doesNotExistInPrisma), } return field }), ], - }) + { exported: true } + ) } if (graphql.isEnumType(type)) { - externalTSFile.addTypeAlias({ - name: type.name, - isExported: true, - type: - '"' + - type - .getValues() - .map((m) => (m as { value: string }).value) - .join('" | "') + - '"', - }) + const union = + '"' + + type + .getValues() + .map((m) => (m as { value: string }).value) + .join('" | "') + + '"' + dts.rootScope.addTypeAlias(type.name, t.tsTypeReference(t.identifier(union)), { exported: true }) } if (graphql.isUnionType(type)) { - externalTSFile.addTypeAlias({ - name: type.name, - isExported: true, - type: type - .getTypes() - .map((m) => m.name) - .join(" | "), - }) + const union = type + .getTypes() + .map((m) => m.name) + .join(" | ") + dts.rootScope.addTypeAlias(type.name, t.tsTypeReference(t.identifier(union)), { exported: true }) } }) const { scalars, prisma: prismaModels } = mapper.getReferencedGraphQLThingsInMapping() - if (scalars.length) { - externalTSFile.addTypeAliases( - scalars.map((s) => ({ - name: s, - type: "any", - })) - ) + for (const s of scalars) { + dts.rootScope.addTypeAlias(s, t.tsAnyKeyword()) } const allPrismaModels = [...new Set([...prismaModels, ...typesToImport])].sort() if (allPrismaModels.length) { - externalTSFile.addImportDeclaration({ - isTypeOnly: true, - moduleSpecifier: `@prisma/client`, - namedImports: allPrismaModels.map((p) => `${p} as P${p}`), - }) - - allPrismaModels.forEach((p) => { - externalTSFile.addTypeAlias({ - isExported: true, - name: p, - type: `P${p}`, - }) - }) + dts.setImport("@prisma/client", { subImports: allPrismaModels.map((p) => `${p} as P${p}`) }) + + for (const p of allPrismaModels) { + dts.rootScope.addTypeAlias(p, t.tsTypeReference(t.identifier(`P${p}`))) + } } + const text = dts.getResult() const fullPath = context.join(context.pathSettings.typesFolderRoot, context.pathSettings.sharedInternalFilename) - const formatted = await formatDTS(fullPath, externalTSFile.getText()) - const prior = context.sys.readFile(fullPath) - if (prior !== formatted) context.sys.writeFile(fullPath, formatted) + if (prior !== text) context.sys.writeFile(fullPath, text) } diff --git a/src/tests/bugs/parentCanBeGraphQLObject.test.ts b/src/tests/bugs/parentCanBeGraphQLObject.test.ts index 111d3fd..f4e7ed9 100644 --- a/src/tests/bugs/parentCanBeGraphQLObject.test.ts +++ b/src/tests/bugs/parentCanBeGraphQLObject.test.ts @@ -30,13 +30,11 @@ export const Puzzle = { const { vfsMap } = await getDTSFilesForRun({ sdl, gamesService, prismaSchema }) const dts = vfsMap.get("/types/games.d.ts")! expect(dts.trim()).toMatchInlineSnapshot(` - "import type { Puzzle as SPuzzle } from \\"./shared-return-types\\"; - - export interface PuzzleTypeResolvers { - /** SDL: id: Int! */ + "export interface PuzzleTypeResolvers { + /* SDL: id: Int!*/ id: number; } - - type PuzzleAsParent = SPuzzle & { id: () => number };" + type PuzzleAsParent = SPuzzle & {id: () => number} ; + import { Puzzle as SPuzzle } from \\"./shared-return-types\\";" `) }) diff --git a/src/tests/bugs/returnObjectCanBeGraphQLInterfaces.test.ts b/src/tests/bugs/returnObjectCanBeGraphQLInterfaces.test.ts index f706905..6c391e5 100644 --- a/src/tests/bugs/returnObjectCanBeGraphQLInterfaces.test.ts +++ b/src/tests/bugs/returnObjectCanBeGraphQLInterfaces.test.ts @@ -31,28 +31,15 @@ export const Game = { const { vfsMap } = await getDTSFilesForRun({ sdl, gamesService, prismaSchema }) const dts = vfsMap.get("/types/games.d.ts")! expect(dts.trim()).toMatchInlineSnapshot(` - "import type { Game as PGame } from \\"@prisma/client\\"; - import type { GraphQLResolveInfo } from \\"graphql\\"; - - import type { RedwoodGraphQLContext } from \\"@redwoodjs/graphql-server/dist/types\\"; - - import type { Node as RTNode } from \\"./shared-return-types\\"; - import type { Node } from \\"./shared-schema-types\\"; - - export interface GameTypeResolvers { - /** SDL: puzzle: Node! */ - puzzle: ( - args?: undefined, - obj?: { - root: GameAsParent; - context: RedwoodGraphQLContext; - info: GraphQLResolveInfo; - } - ) => RTNode | Promise | (() => Promise); + "export interface GameTypeResolvers { + /* SDL: puzzle: Node!*/ + puzzle: (args?: undefined, obj?: { root: GameAsParent, context: RedwoodGraphQLContext, info: GraphQLResolveInfo }) => RTNode | Promise | (() => Promise); } - - type GameAsParent = PGame & { - puzzle: () => RTNode | Promise | (() => Promise); - };" + type GameAsParent = PGame & {puzzle: () => RTNode | Promise | (() => Promise)} ; + import { Game as PGame } from \\"@prisma/client\\"; + import { GraphQLResolveInfo } from \\"graphql\\"; + import { RedwoodGraphQLContext } from \\"@redwoodjs/graphql-server/dist/types\\"; + import { Node as RTNode } from \\"./shared-return-types\\"; + import { Node } from \\"./shared-schema-types\\";" `) }) diff --git a/src/tests/features/generatesTypesForUnions.test.ts b/src/tests/features/generatesTypesForUnions.test.ts index 6125ea5..508e3da 100644 --- a/src/tests/features/generatesTypesForUnions.test.ts +++ b/src/tests/features/generatesTypesForUnions.test.ts @@ -42,23 +42,19 @@ export const Game = { __typename?: \\"Game\\"; id?: number; } - export interface Puzzle { __typename?: \\"Puzzle\\"; id: number; } - export type Gameish = Game | Puzzle; - export interface Query { __typename?: \\"Query\\"; - gameObj?: Game | null | Puzzle | null | null; + gameObj?: Game| null | Puzzle| null| null; gameArr: (Game | Puzzle)[]; } - export interface Mutation { __typename?: \\"Mutation\\"; - __?: string | null; + __?: string| null; }" `) }) diff --git a/src/tests/features/preferPromiseFnWhenKnown.test.ts b/src/tests/features/preferPromiseFnWhenKnown.test.ts index 3484f6f..388fb1e 100644 --- a/src/tests/features/preferPromiseFnWhenKnown.test.ts +++ b/src/tests/features/preferPromiseFnWhenKnown.test.ts @@ -54,114 +54,44 @@ export const Game = { const { vfsMap } = await getDTSFilesForRun({ sdl, gamesService, prismaSchema }) const dts = vfsMap.get("/types/games.d.ts")! expect(dts.trim()).toMatchInlineSnapshot(` - "import type { Game as PGame } from \\"@prisma/client\\"; - import type { GraphQLResolveInfo } from \\"graphql\\"; - - import type { RedwoodGraphQLContext } from \\"@redwoodjs/graphql-server/dist/types\\"; - - import type { Game as RTGame } from \\"./shared-return-types\\"; - import type { Query } from \\"./shared-schema-types\\"; - - /** SDL: gameSync: Game */ + "/*SDL: gameSync: Game*/ export interface GameSyncResolver { - ( - args?: object, - obj?: { - root: Query; - context: RedwoodGraphQLContext; - info: GraphQLResolveInfo; - } - ): RTGame | null | Promise | (() => Promise); + (args?: object, obj?: { root: Query, context: RedwoodGraphQLContext, info: GraphQLResolveInfo }): RTGame| null | Promise | (() => Promise); } - - /** SDL: gameAsync: Game */ + /*SDL: gameAsync: Game*/ export interface GameAsyncResolver { - ( - args?: object, - obj?: { - root: Query; - context: RedwoodGraphQLContext; - info: GraphQLResolveInfo; - } - ): Promise; + (args?: object, obj?: { root: Query, context: RedwoodGraphQLContext, info: GraphQLResolveInfo }): Promise; } - - /** SDL: gameAsync1Arg: Game */ + /*SDL: gameAsync1Arg: Game*/ export interface GameAsync1ArgResolver { - ( - args: object, - obj?: { - root: Query; - context: RedwoodGraphQLContext; - info: GraphQLResolveInfo; - } - ): RTGame | null | Promise | (() => Promise); + (args: object, obj?: { root: Query, context: RedwoodGraphQLContext, info: GraphQLResolveInfo }): RTGame| null | Promise | (() => Promise); } - - /** SDL: gameAsync2Arg: Game */ + /*SDL: gameAsync2Arg: Game*/ export interface GameAsync2ArgResolver { - ( - args: object, - obj: { - root: Query; - context: RedwoodGraphQLContext; - info: GraphQLResolveInfo; - } - ): RTGame | null | Promise | (() => Promise); + (args: object, obj: { root: Query, context: RedwoodGraphQLContext, info: GraphQLResolveInfo }): RTGame| null | Promise | (() => Promise); } - - /** SDL: gameObj: Game */ + /*SDL: gameObj: Game*/ export interface GameObjResolver { - ( - args?: object, - obj?: { - root: Query; - context: RedwoodGraphQLContext; - info: GraphQLResolveInfo; - } - ): RTGame | null; + (args?: object, obj?: { root: Query, context: RedwoodGraphQLContext, info: GraphQLResolveInfo }): RTGame| null; } - export interface GameTypeResolvers { - /** SDL: summary: String! */ + /* SDL: summary: String!*/ summary: string; - - /** SDL: summarySync: String! */ - summarySync: ( - args?: undefined, - obj?: { - root: GameAsParent; - context: RedwoodGraphQLContext; - info: GraphQLResolveInfo; - } - ) => string; - - /** SDL: summarySyncBlock: String! */ - summarySyncBlock: ( - args?: undefined, - obj?: { - root: GameAsParent; - context: RedwoodGraphQLContext; - info: GraphQLResolveInfo; - } - ) => string | Promise | (() => Promise); - - /** SDL: summaryAsync: String! */ - summaryAsync: ( - args?: undefined, - obj?: { - root: GameAsParent; - context: RedwoodGraphQLContext; - info: GraphQLResolveInfo; - } - ) => Promise; + /* SDL: summarySync: String!*/ + summarySync: (args?: undefined, obj?: { root: GameAsParent, context: RedwoodGraphQLContext, info: GraphQLResolveInfo }) => string; + /* SDL: summarySyncBlock: String!*/ + summarySyncBlock: (args?: undefined, obj?: { root: GameAsParent, context: RedwoodGraphQLContext, info: GraphQLResolveInfo }) => string | Promise | (() => Promise); + /* SDL: summaryAsync: String!*/ + summaryAsync: (args?: undefined, obj?: { root: GameAsParent, context: RedwoodGraphQLContext, info: GraphQLResolveInfo }) => Promise; } - - type GameAsParent = PGame & { - summary: () => string; - summarySync: () => string; - summarySyncBlock: () => string | Promise | (() => Promise); - summaryAsync: () => Promise; - } & Extended;" + type GameAsParent = PGame & {summary: () => string, + summarySync: () => string, + summarySyncBlock: () => string | Promise | (() => Promise), + summaryAsync: () => Promise} & Extended; + import { Game as PGame } from \\"@prisma/client\\"; + import { GraphQLResolveInfo } from \\"graphql\\"; + import { RedwoodGraphQLContext } from \\"@redwoodjs/graphql-server/dist/types\\"; + import { Game as RTGame } from \\"./shared-return-types\\"; + import { Query } from \\"./shared-schema-types\\";" `) }) diff --git a/src/tests/features/returnTypePositionsWhichPreferPrisma.test.ts b/src/tests/features/returnTypePositionsWhichPreferPrisma.test.ts index 08039ab..7f1a32b 100644 --- a/src/tests/features/returnTypePositionsWhichPreferPrisma.test.ts +++ b/src/tests/features/returnTypePositionsWhichPreferPrisma.test.ts @@ -41,40 +41,20 @@ export const Game = { expect(dts.trimStart()).toMatchInlineSnapshot( ` - "import type { Game as PGame } from \\"@prisma/client\\"; - import type { GraphQLResolveInfo } from \\"graphql\\"; - - import type { RedwoodGraphQLContext } from \\"@redwoodjs/graphql-server/dist/types\\"; - - import type { Game as RTGame } from \\"./shared-return-types\\"; - import type { Query } from \\"./shared-schema-types\\"; - - /** SDL: game: Game */ + "/*SDL: game: Game*/ export interface GameResolver { - ( - args?: object, - obj?: { - root: Query; - context: RedwoodGraphQLContext; - info: GraphQLResolveInfo; - } - ): RTGame | null | Promise | (() => Promise); + (args?: object, obj?: { root: Query, context: RedwoodGraphQLContext, info: GraphQLResolveInfo }): RTGame| null | Promise | (() => Promise); } - export interface GameTypeResolvers { - /** SDL: summary: String! */ - summary: ( - args: undefined, - obj: { - root: GameAsParent; - context?: RedwoodGraphQLContext; - info?: GraphQLResolveInfo; - } - ) => string; + /* SDL: summary: String!*/ + summary: (args: undefined, obj: { root: GameAsParent, context?: RedwoodGraphQLContext, info?: GraphQLResolveInfo }) => string; } - - type GameAsParent = PGame & { summary: () => string }; - " + type GameAsParent = PGame & {summary: () => string} ; + import { Game as PGame } from \\"@prisma/client\\"; + import { GraphQLResolveInfo } from \\"graphql\\"; + import { RedwoodGraphQLContext } from \\"@redwoodjs/graphql-server/dist/types\\"; + import { Game as RTGame } from \\"./shared-return-types\\"; + import { Query } from \\"./shared-schema-types\\";" ` ) }) diff --git a/src/tests/features/supportGenericExtension.test.ts b/src/tests/features/supportGenericExtension.test.ts index c8018a0..c5b375d 100644 --- a/src/tests/features/supportGenericExtension.test.ts +++ b/src/tests/features/supportGenericExtension.test.ts @@ -29,14 +29,11 @@ export const Game: GameResolvers<{ type: string }> = {}; expect(vfsMap.get("/types/games.d.ts")!).toContain("interface GameTypeResolvers") - expect(vfsMap.get("/types/games.d.ts")!).toContain("GameAsParent = PGame & Extended") + expect(vfsMap.get("/types/games.d.ts")!).toContain("GameAsParent = PGame & Extended") expect(vfsMap.get("/types/games.d.ts"))!.toMatchInlineSnapshot(` - "import type { Game as PGame } from \\"@prisma/client\\"; - - export interface GameTypeResolvers {} - - type GameAsParent = PGame & Extended; - " + "export interface GameTypeResolvers {} + type GameAsParent = PGame & Extended; + import { Game as PGame } from \\"@prisma/client\\";" `) }) diff --git a/src/tests/features/supportRefferingToEnumsOnlyInSDL.test.ts b/src/tests/features/supportReferringToEnumsOnlyInSDL.test.ts similarity index 66% rename from src/tests/features/supportRefferingToEnumsOnlyInSDL.test.ts rename to src/tests/features/supportReferringToEnumsOnlyInSDL.test.ts index 54dcdb9..8f903d3 100644 --- a/src/tests/features/supportRefferingToEnumsOnlyInSDL.test.ts +++ b/src/tests/features/supportReferringToEnumsOnlyInSDL.test.ts @@ -38,30 +38,17 @@ export const Game: GameResolvers = {}; // We are expecting to see import type GameType from "./shared-schema-types" expect(vfsMap.get("/types/games.d.ts")).toMatchInlineSnapshot(` - "import type { Game as PGame } from \\"@prisma/client\\"; - import type { GraphQLResolveInfo } from \\"graphql\\"; - - import type { RedwoodGraphQLContext } from \\"@redwoodjs/graphql-server/dist/types\\"; - - import type { Game as RTGame } from \\"./shared-return-types\\"; - import type { GameType, Query } from \\"./shared-schema-types\\"; - - /** SDL: allGames(type: GameType!): [Game!]! */ + "/*SDL: allGames(type: GameType!): [Game!]!*/ export interface AllGamesResolver { - ( - args?: { type: GameType }, - obj?: { - root: Query; - context: RedwoodGraphQLContext; - info: GraphQLResolveInfo; - } - ): RTGame[] | Promise | (() => Promise); + (args?: {type: GameType}, obj?: { root: Query, context: RedwoodGraphQLContext, info: GraphQLResolveInfo }): RTGame[] | Promise | (() => Promise); } - export interface GameTypeResolvers {} - - type GameAsParent = PGame; - " + type GameAsParent = PGame ; + import { Game as PGame } from \\"@prisma/client\\"; + import { GraphQLResolveInfo } from \\"graphql\\"; + import { RedwoodGraphQLContext } from \\"@redwoodjs/graphql-server/dist/types\\"; + import { Game as RTGame } from \\"./shared-return-types\\"; + import { GameType, Query } from \\"./shared-schema-types\\";" `) expect(vfsMap.get("/types/shared-schema-types.d.ts"))!.toMatchInlineSnapshot(` @@ -70,18 +57,14 @@ export const Game: GameResolvers = {}; id: number; games: Game[]; } - export interface Query { __typename?: \\"Query\\"; allGames: Game[]; } - export type GameType = \\"FOOTBALL\\" | \\"BASKETBALL\\"; - export interface Mutation { __typename?: \\"Mutation\\"; - __?: string | null; - } - " + __?: string| null; + }" `) }) diff --git a/src/tests/integration.puzzmo.test.ts b/src/tests/integration.puzzmo.test.ts new file mode 100644 index 0000000..5a4a71a --- /dev/null +++ b/src/tests/integration.puzzmo.test.ts @@ -0,0 +1,44 @@ +import { existsSync } from "node:fs" +import { join, resolve } from "node:path" + +import { createSystem } from "@typescript/vfs" +import { describe, expect, it } from "vitest" + +import { runFullCodegen } from "../index" + +it("Passes", () => expect(true).toBe(true)) + +const hasAccessToPuzzmo = existsSync("../app/package.json") +const desc = hasAccessToPuzzmo ? describe : describe.skip + +desc("Puzzmo", () => { + it("Runs the entire puzzmo codebase fast", async () => { + const puzzmoAPIWD = resolve(process.cwd() + "/..../../../app/apps/api.puzzmo.com") + const vfsMap = new Map() + const vfs = createSystem(vfsMap) + + // Replicates a Redwood project config object + const paths = { + base: puzzmoAPIWD, + api: { + base: puzzmoAPIWD, + config: "-", + dbSchema: join(puzzmoAPIWD, "prisma", "schema.prisma"), + directives: join(puzzmoAPIWD, "src", "directives"), + graphql: join(puzzmoAPIWD, "src", "functions", "graphql.ts"), + lib: join(puzzmoAPIWD, "src", "lib"), + models: "-", + services: join(puzzmoAPIWD, "src", "services"), + src: join(puzzmoAPIWD, "src"), + types: join(puzzmoAPIWD, "types"), + }, + generated: { + schema: join(puzzmoAPIWD, "..", "..", "api-schema.graphql"), + }, + web: {}, + scripts: "-", + } + + await runFullCodegen("redwood", { paths, verbose: true, sys: vfs }) + }) +}) diff --git a/src/tests/testRunner.ts b/src/tests/testRunner.ts index c969c35..3d4b4de 100644 --- a/src/tests/testRunner.ts +++ b/src/tests/testRunner.ts @@ -56,7 +56,7 @@ export async function getDTSFilesForRun(run: Run) { } if (run.generateShared) { - await createSharedSchemaFiles(appContext) + await createSharedSchemaFiles(appContext, false) } return { diff --git a/src/tsBuilder.ts b/src/tsBuilder.ts new file mode 100644 index 0000000..17943df --- /dev/null +++ b/src/tsBuilder.ts @@ -0,0 +1,311 @@ +import generator from "@babel/generator" +import parser from "@babel/parser" +import traverse from "@babel/traverse" +import t, { + addComment, + BlockStatement, + Declaration, + ExpressionStatement, + Statement, + TSType, + TSTypeParameterDeclaration, +} from "@babel/types" + +interface InterfaceProperty { + docs?: string + name: string + optional: boolean + type: string +} + +interface InterfaceCallSignature { + docs?: string + params: { name: string; optional?: boolean; type: string }[] + returnType: string + type: "call-signature" +} + +interface NodeConfig { + docs?: string + exported?: boolean + generics?: { name: string }[] +} + +export const builder = (priorSource: string, opts: {}) => { + const sourceFile = parser.parse(priorSource, { sourceType: "module", plugins: ["jsx", "typescript"] }) + + /** Declares an import which should exist in the source document */ + const setImport = (source: string, opts: { mainImport?: string; subImports?: string[] }) => { + const imports = sourceFile.program.body.filter((s) => s.type === "ImportDeclaration") + + const existing = imports.find((i) => i.source.value === source) + if (!existing) { + const imports = [] as (t.ImportSpecifier | t.ImportDefaultSpecifier)[] + if (opts.mainImport) { + imports.push(t.importDefaultSpecifier(t.identifier(opts.mainImport))) + } + + if (opts.subImports) { + imports.push(...opts.subImports.map((si) => t.importSpecifier(t.identifier(si), t.identifier(si)))) + } + + const importDeclaration = t.importDeclaration(imports, t.stringLiteral(source)) + sourceFile.program.body.push(importDeclaration) + return + } + + if (!existing.specifiers.find((f) => f.type === "ImportDefaultSpecifier") && opts.mainImport) { + existing.specifiers.push(t.importDefaultSpecifier(t.identifier(opts.mainImport))) + } + + if (opts.subImports) { + const existingImports = existing.specifiers.map((e) => e.local.name) + const newImports = opts.subImports.filter((si) => !existingImports.includes(si)) + + if (newImports.length) { + existing.specifiers.push(...newImports.map((si) => t.importSpecifier(t.identifier(si), t.identifier(si)))) + } + } + } + + /** Allows creating a type alias via an AST parsed string */ + const setTypeViaTemplate = (template: string) => { + const type = parser.parse(template, { sourceType: "module", plugins: ["jsx", "typescript"] }) + + const typeDeclaration = type.program.body.find((s) => s.type === "TSTypeAliasDeclaration") + if (!typeDeclaration) throw new Error("No type declaration found in template: " + template) + + const oldTypeDeclaration = sourceFile.program.body.find( + (s) => s.type === "TSTypeAliasDeclaration" && s.id.name === typeDeclaration.id.name + ) + if (!oldTypeDeclaration) { + sourceFile.program.body.push(typeDeclaration) + return + } + + if (!t.isTSTypeAliasDeclaration(oldTypeDeclaration)) throw new Error("Expected TSTypeAliasDeclaration") + + const newAnnotion = typeDeclaration.typeAnnotation + + // is literal primitive + if (newAnnotion.type.endsWith("LiteralTypeAnnotation")) { + oldTypeDeclaration.typeAnnotation = newAnnotion + return + } + + if (t.isTSTypeLiteral(newAnnotion) && t.isTSTypeLiteral(oldTypeDeclaration.typeAnnotation)) { + for (const field of newAnnotion.members) { + const matchingOnOld = oldTypeDeclaration.typeAnnotation.members.find((mm) => { + if (!t.isTSPropertySignature(mm) || !t.isTSPropertySignature(field)) return false + if (!t.isIdentifier(mm.key) || !t.isIdentifier(field.key)) return false + return mm.key.name === field.key.name + }) + + if (matchingOnOld) { + matchingOnOld.typeAnnotation = field.typeAnnotation + } else { + oldTypeDeclaration.typeAnnotation.members.push(field) + } + } + + return + } + + // @ts-expect-error - ts/js babel interop issue + const code = generator(newAnnotion).code + throw new Error(`Unsupported type annotation: ${newAnnotion.type} - ${code}`) + } + + /** An internal API for describing a new area for inputting template info */ + const createScope = (scopeName: string, scopeNode: t.Node, statements: Statement[]) => { + const addFunction = (name: string) => { + let functionNode = statements.find( + (s) => t.isVariableDeclaration(s) && t.isIdentifier(s.declarations[0].id) && s.declarations[0].id.name === name + ) as t.VariableDeclaration | undefined + + if (!functionNode) { + functionNode = t.variableDeclaration("const", [ + t.variableDeclarator(t.identifier(name), t.arrowFunctionExpression([], t.blockStatement([]))), + ]) + statements.push(functionNode) + } + + const arrowFn = functionNode.declarations[0].init as t.ArrowFunctionExpression + if (!t.isArrowFunctionExpression(arrowFn)) throw new Error("Expected ArrowFunctionExpression") + + return { + node: arrowFn, + addParam: (name: string, type: string) => { + const param = t.identifier(name) + + const fromParse = getTypeLevelAST(type) + param.typeAnnotation = t.tsTypeAnnotation(fromParse) + + const exists = arrowFn.params.find((p) => p.type === "Identifier" && p.name === name) + if (!exists) arrowFn.params.push(param) + else exists.typeAnnotation = param.typeAnnotation + }, + + scope: createScope(name, arrowFn, (arrowFn.body as BlockStatement).body), + } + } + + const addVariableDeclaration = (name: string, add: (prior: t.Expression | undefined) => t.Expression) => { + const prior = statements.find( + (b) => t.isVariableDeclaration(b) && t.isIdentifier(b.declarations[0].id) && b.declarations[0].id.name === name + ) + + if (prior && t.isVariableDeclaration(prior) && t.isVariableDeclarator(prior.declarations[0]) && prior.declarations[0].init) { + prior.declarations[0].init = add(prior.declarations[0].init) + return + } + + const declaration = t.variableDeclaration("const", [t.variableDeclarator(t.identifier(name), add(undefined))]) + statements.push(declaration) + } + + const addTypeAlias = (name: string, type: "any" | "string" | TSType, nodeConfig?: NodeConfig) => { + const prior = statements.find( + (s) => + (t.isTSTypeAliasDeclaration(s) && s.id.name === name) || + (t.isExportNamedDeclaration(s) && t.isTSTypeAliasDeclaration(s.declaration) && s.declaration.id.name === name) + ) + if (prior) return + + // Allow having some easy literals + let typeNode = null + if (typeof type === "string") { + if (type === "any") typeNode = t.tsAnyKeyword() + if (type === "string") typeNode = t.tsStringKeyword() + } else { + typeNode = type + } + + const alias = t.tsTypeAliasDeclaration(t.identifier(name), null, typeNode!) + const statement = nodeFromNodeConfig(alias, nodeConfig) + statements.push(statement) + + return alias + } + + const addInterface = (name: string, fields: (InterfaceCallSignature | InterfaceProperty)[], nodeConfig?: NodeConfig) => { + const prior = statements.find( + (s) => + (t.isTSInterfaceDeclaration(s) && s.id.name === name) || + (t.isExportNamedDeclaration(s) && t.isTSInterfaceDeclaration(s.declaration) && s.declaration.id.name === name) + ) + + if (prior) { + if (t.isTSInterfaceDeclaration(prior)) return prior + if (t.isExportNamedDeclaration(prior) && t.isTSInterfaceDeclaration(prior.declaration)) return prior.declaration + throw new Error("Unknown state") + } + + const body = t.tsInterfaceBody( + fields.map((f) => { + // Allow call signatures + if (!("name" in f) && f.type === "call-signature") { + const sig = t.tsCallSignatureDeclaration( + null, // generics + f.params.map((p) => { + const i = t.identifier(p.name) + i.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier(p.type))) + if (p.optional) i.optional = true + return i + }), + t.tsTypeAnnotation(t.tsTypeReference(t.identifier(f.returnType))) + ) + return sig + } else { + const prop = t.tsPropertySignature(t.identifier(f.name), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(f.type)))) + prop.optional = f.optional + if (f.docs?.length) t.addComment(prop, "leading", " " + f.docs) + return prop + } + }) + ) + + const interfaceDec = t.tsInterfaceDeclaration(t.identifier(name), null, null, body) + const statement = nodeFromNodeConfig(interfaceDec, nodeConfig) + statements.push(statement) + return interfaceDec + } + + const addLeadingComment = (comment: string) => { + const firstStatement = statements[0] || scopeNode + if (firstStatement) { + if (firstStatement.leadingComments?.find((c) => c.value === comment)) return + t.addComment(firstStatement, "leading", comment) + } else { + t.addComment(scopeNode, "leading", comment) + } + } + + return { + addFunction, + addVariableDeclaration, + addTypeAlias, + addInterface, + addLeadingComment, + } + } + + /** Experimental function for parsing out a graphql template tag, and ensuring certain fields have been called */ + const updateGraphQLTemplateTag = (expression: t.Expression, path: string, modelFields: string[]) => { + if (path !== ".") throw new Error("Only support updating the root of the graphql tag ATM") + // @ts-expect-error - ts/js babel interop issue + traverse( + expression, + { + TaggedTemplateExpression(path: traverse.NodePath) { + const { tag, quasi } = path.node + if (t.isIdentifier(tag) && tag.name === "graphql") { + // This is the graphql query + const query = quasi.quasis[0].value.raw + const inner = query.match(/\{(.*)\}/)?.[1] + if (inner === undefined) throw new Error("Could not find inner query") + + path.replaceWithSourceString(`graphql\`${query.replace(inner, `${inner}, ${modelFields.join(", ")}`)}\``) + path.stop() + } + }, + }, + // Uh oh, not really sure what a Scope object does here + {} as any + ) + return expression + } + + const parseStatement = (code: string) => + parser.parse(code, { sourceType: "module", plugins: ["jsx", "typescript"] }).program.body[0] as ExpressionStatement + + // @ts-expect-error - ts/js babel interop issue + const getResult = () => generator(sourceFile.program, {}).code + + const rootScope = createScope("root", sourceFile, sourceFile.program.body) + return { setImport, getResult, setTypeViaTemplate, parseStatement, updateGraphQLTemplateTag, rootScope } +} + +/** Parses something as though it is in type-space and extracts the subset of the AST that the string represents */ +const getTypeLevelAST = (type: string) => { + const typeAST = parser.parse(`type A = ${type}`, { sourceType: "module", plugins: ["jsx", "typescript"] }) + const typeDeclaration = typeAST.program.body.find((s) => t.isTSTypeAliasDeclaration(s)) + if (!typeDeclaration) throw new Error("No type declaration found in template: " + type) + return typeDeclaration.typeAnnotation +} + +export type TSBuilder = ReturnType + +/** A little helper to handle all the extras for */ +const nodeFromNodeConfig = ( + node: T, + nodeConfig?: NodeConfig +) => { + const statement = nodeConfig?.exported ? t.exportNamedDeclaration(node) : node + if (nodeConfig?.docs) addComment(statement, "leading", nodeConfig.docs) + if (nodeConfig?.generics && nodeConfig.generics.length > 0) { + node.typeParameters = t.tsTypeParameterDeclaration(nodeConfig.generics.map((g) => t.tsTypeParameter(null, null, g.name))) + } + + return statement +} diff --git a/src/utils.ts b/src/utils.ts index cff11aa..080d380 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,6 +1,7 @@ import * as graphql from "graphql" import * as tsMorph from "ts-morph" +import { TSBuilder } from "./tsBuilder.js" import { TypeMapper } from "./typeMap.js" export const varStartsWithUppercase = (v: tsMorph.VariableDeclaration) => v.getName()[0].startsWith(v.getName()[0].toUpperCase()) @@ -32,7 +33,7 @@ export const inlineArgsForField = (field: graphql.GraphQLField export const createAndReferOrInlineArgsForField = ( field: graphql.GraphQLField, config: { - file: tsMorph.SourceFile + dts: TSBuilder mapper: TypeMapper["map"] name: string noSeparateType?: true @@ -42,17 +43,23 @@ export const createAndReferOrInlineArgsForField = ( if (!inlineArgs) return undefined if (inlineArgs.length < 120) return inlineArgs - const argsInterface = config.file.addInterface({ - name: `${config.name}Args`, - isExported: true, - }) - - field.args.forEach((a) => { - argsInterface.addProperty({ + const dts = config.dts + dts.rootScope.addInterface( + `${config.name}Args`, + field.args.map((a) => ({ name: a.name, - type: config.mapper(a.type, {}), - }) - }) + type: config.mapper(a.type, {})!, + optional: false, + })) + ) return `${config.name}Args` } + +export const makeStep = (verbose: boolean) => async (msg: string, fn: () => Promise | Promise | void) => { + if (!verbose) return fn() + console.log("[sdl-codegen] " + msg) + console.time("[sdl-codegen] " + msg) + await fn() + console.timeEnd("[sdl-codegen] " + msg) +}