diff --git a/__fixtures__/decorators/src/class.ts b/__fixtures__/decorators/src/class.ts new file mode 100644 index 0000000..483cc07 --- /dev/null +++ b/__fixtures__/decorators/src/class.ts @@ -0,0 +1,37 @@ +import { admin, creator, external, internal } from '@hyperweb/decorators'; +import { BigNumber } from 'jsd-std'; + +export interface State { + count: BigNumber; +} + +export class Counter { + private state: State; + + constructor(initialState: State) { + this.state.count = initialState; + } + + // Public by default (no decorator needed) + @external + @admin + public getCount(): BigNumber { + return this.state.count; + } + + // Only admin and creator can increment + @internal + @admin + public increment(amount: BigNumber): void { + this.state.count = this.state.count.add(amount); + } + + // Only creator can decrement + @creator + public decrement(amount: BigNumber): void { + if (this.state.count.lt(amount)) { + throw new Error('Count cannot be negative'); + } + this.state.count = this.state.count.sub(amount); + } +} \ No newline at end of file diff --git a/__fixtures__/decorators/src/index.ts b/__fixtures__/decorators/src/index.ts new file mode 100644 index 0000000..8a3bce7 --- /dev/null +++ b/__fixtures__/decorators/src/index.ts @@ -0,0 +1,12 @@ +export * from './class'; +export * from './object'; +class MyClass { + @permission('debug', 'level') + @performance + async fetchData() { + // ... method implementation + } +} + +export default MyClass; +export {MyClass}; \ No newline at end of file diff --git a/__fixtures__/decorators/src/object.ts b/__fixtures__/decorators/src/object.ts new file mode 100644 index 0000000..3a6a830 --- /dev/null +++ b/__fixtures__/decorators/src/object.ts @@ -0,0 +1,30 @@ +import { BigNumber } from "jsd-std"; + +interface State { + count: BigNumber; +} + +// Core contract logic +export const start = (initialCount: BigNumber) => { + let state: State = { + count: initialCount + }; + + // HOW TO EVEN DO DECORATORS + return { + getCount: () => state.count, + + increment: (amount: BigNumber) => { + state.count = state.count.add(amount); + return state.count; + }, + + decrement: (amount: BigNumber) => { + if (state.count.lt(amount)) { + throw new Error("Count cannot be negative"); + } + state.count = state.count.sub(amount); + return state.count; + } + }; +}; \ No newline at end of file diff --git a/__output__/decorators/bundle.js b/__output__/decorators/bundle.js new file mode 100644 index 0000000..60d0183 --- /dev/null +++ b/__output__/decorators/bundle.js @@ -0,0 +1,57 @@ +// ../../__fixtures__/decorators/src/class.ts +var Counter = class { + state; + constructor(initialState) { + this.state.count = initialState; + } + // Public by default (no decorator needed) + getCount() { + return this.state.count; + } + // Only admin and creator can increment + increment(amount) { + this.state.count = this.state.count.add(amount); + } + // Only creator can decrement + decrement(amount) { + if (this.state.count.lt(amount)) { + throw new Error("Count cannot be negative"); + } + this.state.count = this.state.count.sub(amount); + } +}; + +// ../../__fixtures__/decorators/src/object.ts +var start = (initialCount) => { + let state = { + count: initialCount + }; + return { + getCount: () => state.count, + increment: (amount) => { + state.count = state.count.add(amount); + return state.count; + }, + decrement: (amount) => { + if (state.count.lt(amount)) { + throw new Error("Count cannot be negative"); + } + state.count = state.count.sub(amount); + return state.count; + } + }; +}; + +// ../../__fixtures__/decorators/src/index.ts +var MyClass = class { + async fetchData() { + } +}; +var src_default = MyClass; +export { + Counter, + MyClass, + src_default as default, + start +}; +//# sourceMappingURL=bundle.js.map diff --git a/__output__/decorators/bundle.js.map b/__output__/decorators/bundle.js.map new file mode 100644 index 0000000..5d35b25 --- /dev/null +++ b/__output__/decorators/bundle.js.map @@ -0,0 +1,7 @@ +{ + "version": 3, + "sources": ["../../__fixtures__/decorators/src/class.ts", "../../__fixtures__/decorators/src/object.ts", "../../__fixtures__/decorators/src/index.ts"], + "sourcesContent": ["import { admin, creator, external, internal } from '@hyperweb/decorators';\nimport { BigNumber } from 'jsd-std';\nexport interface State {\n count: BigNumber;\n}\nexport class Counter {\n private state: State;\n constructor(initialState: State) {\n this.state.count = initialState;\n }\n\n // Public by default (no decorator needed)\n public getCount(): BigNumber {\n return this.state.count;\n }\n\n // Only admin and creator can increment\n public increment(amount: BigNumber): void {\n this.state.count = this.state.count.add(amount);\n }\n\n // Only creator can decrement\n public decrement(amount: BigNumber): void {\n if (this.state.count.lt(amount)) {\n throw new Error('Count cannot be negative');\n }\n this.state.count = this.state.count.sub(amount);\n }\n}", "import { BigNumber } from \"jsd-std\";\n\ninterface State {\n count: BigNumber;\n}\n\n// Core contract logic\nexport const start = (initialCount: BigNumber) => {\n let state: State = {\n count: initialCount\n };\n\n // HOW TO EVEN DO DECORATORS\n return {\n getCount: () => state.count,\n \n increment: (amount: BigNumber) => {\n state.count = state.count.add(amount);\n return state.count;\n },\n \n decrement: (amount: BigNumber) => {\n if (state.count.lt(amount)) {\n throw new Error(\"Count cannot be negative\");\n }\n state.count = state.count.sub(amount);\n return state.count;\n }\n };\n};", "export * from './class';\nexport * from './object';\nclass MyClass {\n async fetchData() {\n // ... method implementation\n }\n}\nexport default MyClass;\nexport { MyClass };"], + "mappings": ";AAKO,IAAM,UAAN,MAAc;AAAA,EACX;AAAA,EACR,YAAY,cAAqB;AAC/B,SAAK,MAAM,QAAQ;AAAA,EACrB;AAAA;AAAA,EAGO,WAAsB;AAC3B,WAAO,KAAK,MAAM;AAAA,EACpB;AAAA;AAAA,EAGO,UAAU,QAAyB;AACxC,SAAK,MAAM,QAAQ,KAAK,MAAM,MAAM,IAAI,MAAM;AAAA,EAChD;AAAA;AAAA,EAGO,UAAU,QAAyB;AACxC,QAAI,KAAK,MAAM,MAAM,GAAG,MAAM,GAAG;AAC/B,YAAM,IAAI,MAAM,0BAA0B;AAAA,IAC5C;AACA,SAAK,MAAM,QAAQ,KAAK,MAAM,MAAM,IAAI,MAAM;AAAA,EAChD;AACF;;;ACrBO,IAAM,QAAQ,CAAC,iBAA4B;AAChD,MAAI,QAAe;AAAA,IACjB,OAAO;AAAA,EACT;AAGA,SAAO;AAAA,IACL,UAAU,MAAM,MAAM;AAAA,IAEtB,WAAW,CAAC,WAAsB;AAChC,YAAM,QAAQ,MAAM,MAAM,IAAI,MAAM;AACpC,aAAO,MAAM;AAAA,IACf;AAAA,IAEA,WAAW,CAAC,WAAsB;AAChC,UAAI,MAAM,MAAM,GAAG,MAAM,GAAG;AAC1B,cAAM,IAAI,MAAM,0BAA0B;AAAA,MAC5C;AACA,YAAM,QAAQ,MAAM,MAAM,IAAI,MAAM;AACpC,aAAO,MAAM;AAAA,IACf;AAAA,EACF;AACF;;;AC3BA,IAAM,UAAN,MAAc;AAAA,EACZ,MAAM,YAAY;AAAA,EAElB;AACF;AACA,IAAO,cAAQ;", + "names": [] +} diff --git a/__output__/decorators/decorators.json b/__output__/decorators/decorators.json new file mode 100644 index 0000000..428186b --- /dev/null +++ b/__output__/decorators/decorators.json @@ -0,0 +1,44 @@ +{ + "../../__fixtures__/decorators/src/index.ts": [ + { + "name": "permission", + "args": [ + "debug", + "level" + ], + "targetName": "fetchData" + }, + { + "name": "performance", + "args": [], + "targetName": "fetchData" + } + ], + "../../__fixtures__/decorators/src/class.ts": [ + { + "name": "external", + "args": [], + "targetName": "getCount" + }, + { + "name": "admin", + "args": [], + "targetName": "getCount" + }, + { + "name": "internal", + "args": [], + "targetName": "increment" + }, + { + "name": "admin", + "args": [], + "targetName": "increment" + }, + { + "name": "creator", + "args": [], + "targetName": "decrement" + } + ] +} \ No newline at end of file diff --git a/packages/build/__tests__/decorators.test.ts b/packages/build/__tests__/decorators.test.ts new file mode 100644 index 0000000..05de813 --- /dev/null +++ b/packages/build/__tests__/decorators.test.ts @@ -0,0 +1,41 @@ +import fs from 'fs/promises'; +import { join, resolve } from 'path'; + +import { createDecoratorExtractorPlugin } from '../src/decorators'; +import { HyperwebBuild, HyperwebBuildOptions } from '../src/index'; + +const fixtureDir = resolve(join(__dirname, '/../../../__fixtures__/', 'decorators')); +const outputDir = resolve(join(__dirname, '/../../../__output__/', 'decorators')); + +describe('HyperwebBuild', () => { + it('builds the fixture project successfully', async () => { + const outfile = join(outputDir, 'bundle.js'); + + const options: Partial = { + entryPoints: [join(fixtureDir, 'src/index.ts')], + outfile, + external: ['otherpackage', '~somepackage'], + customPlugins: [ + createDecoratorExtractorPlugin({ + outputPath: join(outputDir, 'decorators.json'), + include: [/\.ts$/], // Only process TypeScript files + exclude: [/node_modules/, /\.test\.ts$/] // Skip node_modules and test files + }) + ] + }; + + await HyperwebBuild.build(options); + + // Check if the output file exists + const outfileExists = await fs.access(outfile) + .then(() => true) + .catch(() => false); + + expect(outfileExists).toBe(true); + + // Optionally, you can read the contents of the file and perform additional checks + // const bundleContent = await fs.readFile(outfile, 'utf-8'); + // expect(bundleContent).toContain('function greet'); + // expect(bundleContent).toContain('function farewell'); + }); +}); \ No newline at end of file diff --git a/packages/build/__tests__/second.test.ts b/packages/build/__tests__/imports.test.ts similarity index 100% rename from packages/build/__tests__/second.test.ts rename to packages/build/__tests__/imports.test.ts diff --git a/packages/build/package.json b/packages/build/package.json index 8a26362..1ecf0ef 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -31,6 +31,10 @@ }, "keywords": [], "dependencies": { + "@babel/generator": "7.22.9", + "@babel/parser": "^7.22.7", + "@babel/traverse": "7.22.8", + "@babel/types": "7.22.5", "esbuild": "^0.23.1" } } diff --git a/packages/build/src/decorators.ts b/packages/build/src/decorators.ts new file mode 100644 index 0000000..a515e94 --- /dev/null +++ b/packages/build/src/decorators.ts @@ -0,0 +1,150 @@ +import generate from '@babel/generator'; +import * as parser from '@babel/parser'; +import traverse from '@babel/traverse'; +import * as t from '@babel/types'; +import { Plugin } from 'esbuild'; +import * as path from 'path'; + +import { HyperwebBuildOptions } from './index'; + +interface DecoratorInfo { + name: string; + args: any[]; + targetName: string; + targetType?: 'method' | 'function'; + location?: { + file: string; + line: number; + column: number; + }; +} + +interface DecoratorExtractorOptions { + outputPath?: string; // Where to save the decorator metadata + include?: RegExp[]; // Patterns for files to process + exclude?: RegExp[]; // Patterns for files to ignore +} + +const decoratorMetadata: Record = {}; + + +function normalizeFilePath(filePath: string, rootDir?: string): string { + const projectRoot = rootDir || process.cwd(); + const relativePath = path.relative(projectRoot, filePath); + return relativePath + .replace(/\\/g, '/') + .replace(/^\.\//, ''); + } + +export const createDecoratorExtractorPlugin = ( + pluginOptions: DecoratorExtractorOptions = {}, + hyperwebOptions?: HyperwebBuildOptions +): Plugin => ({ + name: 'decorator-extractor', + + setup(build) { + + // Set up the file filter + const filter = { + include: pluginOptions.include || [/\.[jt]sx?$/], + exclude: pluginOptions.exclude || [/node_modules/], + }; + + build.onLoad({ filter: new RegExp(filter.include.map(r => r.source).join('|')) }, async (args) => { + // Skip excluded files + if (filter.exclude.some(pattern => pattern.test(args.path))) { + return null; + } + + // Read the file + const source = await require('fs').promises.readFile(args.path, 'utf8'); + + // Parse the code with babel + const ast = parser.parse(source, { + sourceType: 'module', + plugins: ['typescript', 'decorators-legacy'], + }); + + // Track if we made any modifications + let modified = false; + + // Traverse the AST + traverse(ast, { + Decorator(path) { + const decorator = path.node; + const parent = path.parent; + + // Only process method or function decorators + if (!t.isClassMethod(parent as any) && !t.isFunctionDeclaration(parent as any)) { + return; + } + + const rootDir = hyperwebOptions?.absWorkingDir || process.cwd(); + const normalizedPath = normalizeFilePath(args.path, rootDir); + + // Get decorator information + const decoratorInfo: DecoratorInfo = { + // @ts-ignore + name: t.isIdentifier(decorator.expression) + ? decorator.expression.name + // @ts-ignore + : t.isCallExpression(decorator.expression) + ? (decorator.expression.callee as t.Identifier).name + : 'unknown', + // @ts-ignore + args: t.isCallExpression(decorator.expression) + ? decorator.expression.arguments.map(arg => + // @ts-ignore + t.isLiteral(arg) ? (arg as any).value : null) + : [], + // @ts-ignore + targetName: t.isClassMethod(parent) + ? (parent.key as t.Identifier).name + : (parent as t.FunctionDeclaration).id?.name || 'anonymous', + // @ts-ignore + // targetType: t.isClassMethod(parent) ? 'method' : 'function', + + // location: { + // file: normalizedPath, + // line: decorator.loc?.start.line || 0, + // column: decorator.loc?.start.column || 0, + // } + }; + + // Store the metadata + if (!decoratorMetadata[normalizedPath]) { + decoratorMetadata[normalizedPath] = []; + } + decoratorMetadata[normalizedPath].push(decoratorInfo); + + // Remove the decorator + path.remove(); + modified = true; + } + }); + + // If we made modifications, generate new code + if (modified) { + const output = generate(ast, {}, source); + + return { + contents: output.code, + loader: args.path.endsWith('.ts') ? 'ts' : 'js', + }; + } + + return null; + }); + + build.onEnd(async () => { + if (pluginOptions.outputPath) { + // Save the metadata to the specified file + await require('fs').promises.writeFile( + pluginOptions.outputPath, + JSON.stringify(decoratorMetadata, null, 2), + 'utf8' + ); + } + }); + } +}); \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 514498c..9d766c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18,6 +18,15 @@ "@babel/highlight" "^7.25.7" picocolors "^1.0.0" +"@babel/code-frame@^7.22.5": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.0.tgz#9374b5cd068d128dac0b94ff482594273b1c2815" + integrity sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g== + dependencies: + "@babel/helper-validator-identifier" "^7.25.9" + js-tokens "^4.0.0" + picocolors "^1.0.0" + "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.25.7": version "7.25.7" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.7.tgz#b8479fe0018ef0ac87b6b7a5c6916fcd67ae2c9c" @@ -74,6 +83,16 @@ "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" +"@babel/generator@7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d" + integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw== + dependencies: + "@babel/types" "^7.22.5" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + "@babel/generator@^7.18.10", "@babel/generator@^7.23.6", "@babel/generator@^7.25.7", "@babel/generator@^7.7.2": version "7.25.7" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.7.tgz#de86acbeb975a3e11ee92dd52223e6b03b479c56" @@ -84,6 +103,17 @@ "@jridgewell/trace-mapping" "^0.3.25" jsesc "^3.0.2" +"@babel/generator@^7.22.7": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.0.tgz#505cc7c90d92513f458a477e5ef0703e7c91b8d7" + integrity sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w== + dependencies: + "@babel/parser" "^7.26.0" + "@babel/types" "^7.26.0" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" + jsesc "^3.0.2" + "@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.25.7": version "7.25.7" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz#63f02dbfa1f7cb75a9bdb832f300582f30bb8972" @@ -144,14 +174,14 @@ resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.20": +"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9" integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ== dependencies: "@babel/types" "^7.24.7" -"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.23.0": +"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz#75f1e1725742f39ac6584ee0b16d94513da38dd2" integrity sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA== @@ -250,11 +280,21 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz#d50e8d37b1176207b4fe9acedec386c565a44a54" integrity sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g== +"@babel/helper-string-parser@^7.22.5", "@babel/helper-string-parser@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" + integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== + "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.25.7": version "7.25.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz#77b7f60c40b15c97df735b38a66ba1d7c3e93da5" integrity sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg== +"@babel/helper-validator-identifier@^7.22.5", "@babel/helper-validator-identifier@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" + integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== + "@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.25.7": version "7.25.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz#97d1d684448228b30b506d90cace495d6f492729" @@ -299,6 +339,13 @@ dependencies: "@babel/types" "^7.25.7" +"@babel/parser@^7.22.7", "@babel/parser@^7.26.0": + version "7.26.1" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.1.tgz#44e02499960df2cdce2c456372a3e8e0c3c5c975" + integrity sha512-reoQYNiAJreZNsJzyrDNzFQ+IQ5JFiIzAHJg9bn94S3l+4++J7RsIhNMoB+lgP/9tpmiAQqspv+xfdxTSzREOw== + dependencies: + "@babel/types" "^7.26.0" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.25.7" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.7.tgz#c5f755e911dfac7ef6957300c0f9c4a8c18c06f4" @@ -1026,6 +1073,22 @@ debug "^4.1.0" globals "^11.1.0" +"@babel/traverse@7.22.8": + version "7.22.8" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.8.tgz#4d4451d31bc34efeae01eac222b514a77aa4000e" + integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw== + dependencies: + "@babel/code-frame" "^7.22.5" + "@babel/generator" "^7.22.7" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-function-name" "^7.22.5" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.22.7" + "@babel/types" "^7.22.5" + debug "^4.1.0" + globals "^11.1.0" + "@babel/traverse@7.23.6": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.6.tgz#b53526a2367a0dd6edc423637f3d2d0f2521abc5" @@ -1064,6 +1127,15 @@ "@babel/helper-validator-identifier" "^7.18.6" to-fast-properties "^2.0.0" +"@babel/types@7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe" + integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA== + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.5" + to-fast-properties "^2.0.0" + "@babel/types@7.23.6": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" @@ -1082,6 +1154,14 @@ "@babel/helper-validator-identifier" "^7.25.7" to-fast-properties "^2.0.0" +"@babel/types@^7.22.5", "@babel/types@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff" + integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA== + dependencies: + "@babel/helper-string-parser" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -1861,7 +1941,7 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": version "0.3.25" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==