From a01d9d8cfd5529c15c565f2358787cb3935bf18e Mon Sep 17 00:00:00 2001 From: Hyeseong Kim Date: Thu, 19 Oct 2023 02:31:05 +0900 Subject: [PATCH 1/8] emit eslint comments instead of tslint --- jscomp/gentype/EmitType.ml | 22 +- .../typescript-react-example/.eslintrc.json | 6 +- .../package-lock.json | 1586 +++++++++++++++-- .../typescript-react-example/package.json | 15 +- .../src/AutoAnnotate.gen.tsx | 12 +- .../src/BucklescriptAnnotations.gen.tsx | 4 +- .../src/Comments.gen.tsx | 7 +- .../typescript-react-example/src/Core.gen.tsx | 8 +- .../src/Docstrings.gen.tsx | 3 +- .../src/EmitModuleIfNoConversion.gen.tsx | 3 +- .../src/ExportWithRename.gen.tsx | 3 +- .../src/FirstClassModules.gen.tsx | 7 +- .../src/FirstClassModulesInterface.gen.tsx | 5 +- .../typescript-react-example/src/GADT.gen.tsx | 6 +- .../src/Hooks.gen.tsx | 47 +- .../src/IgnoreInterface.gen.tsx | 2 +- .../src/ImportHookDefault.gen.tsx | 2 +- .../src/ImportHooks.gen.tsx | 4 +- .../src/ImportJsValue.gen.tsx | 20 +- .../src/Inherits.gen.tsx | 6 +- .../src/InnerModuleSignature.gen.tsx | 3 +- .../src/JSXV4.gen.tsx | 12 +- .../src/LabeledFun.gen.tsx | 1 + .../src/LetPrivate.gen.tsx | 1 + .../src/Machine.gen.tsx | 3 +- .../src/ModuleAliases.gen.tsx | 15 +- .../src/ModuleAliases2.gen.tsx | 12 +- .../src/MoreVariants.gen.tsx | 5 +- .../src/MyInput.gen.tsx | 2 +- .../src/MyModule.gen.tsx | 3 +- .../src/NestedModules.gen.tsx | 9 +- .../src/NestedModulesInSignature.gen.tsx | 1 + .../src/NestedVariants.gen.tsx | 27 +- .../src/NonrecursiveTypes.gen.tsx | 6 +- .../src/NumericPolyVar.gen.tsx | 2 +- .../src/Object.gen.tsx | 4 +- .../src/OnClick2.gen.tsx | 3 +- .../src/Opaque.gen.tsx | 6 +- .../src/Records.gen.tsx | 21 +- .../src/References.gen.tsx | 7 +- .../src/Shadow.gen.tsx | 1 + .../src/TestEmitInnerModules.gen.tsx | 1 + .../src/TestFirstClassModules.gen.tsx | 3 +- .../src/TestImmutableArray.gen.tsx | 1 + .../src/TestModuleAliases.gen.tsx | 17 +- .../src/TestPromise.gen.tsx | 7 +- .../src/TransitiveType1.gen.tsx | 1 + .../src/TransitiveType2.gen.tsx | 4 +- .../src/TransitiveType3.gen.tsx | 3 +- .../src/TypeNameSanitize.gen.tsx | 6 +- .../src/TypeParams1.gen.tsx | 2 +- .../src/TypeParams2.gen.tsx | 6 +- .../src/TypeParams3.gen.tsx | 1 + .../src/Unboxed.gen.tsx | 11 +- .../src/Uncurried.gen.tsx | 13 +- .../src/Usage.gen.tsx | 1 + .../src/UseImportJsValue.gen.tsx | 1 + .../src/V3Compatibility.gen.tsx | 2 +- .../src/Variants.gen.tsx | 25 +- .../src/VariantsWithPayload.gen.tsx | 15 +- .../src/Warnings.gen.tsx | 1 + .../src/Wrapper.gen.tsx | 3 +- .../src/counter.gen.tsx | 1 + .../src/location/location.gen.tsx | 2 +- .../src/nested/Tuples.gen.tsx | 9 +- .../src/nested/Types.gen.tsx | 52 +- .../src/strange_file_names/404.gen.tsx | 1 + .../strange_file_names/AppModal.web.gen.tsx | 1 + .../src/strange_file_names/_under.gen.tsx | 1 + .../with_underscore.gen.tsx | 1 + .../typescript-react-example/tslint.json | 11 - .../idempotency/genType/src/EmitType.res | 2 +- jscomp/test/variantsMatching.gen.tsx | 14 +- 73 files changed, 1720 insertions(+), 411 deletions(-) delete mode 100644 jscomp/gentype_tests/typescript-react-example/tslint.json diff --git a/jscomp/gentype/EmitType.ml b/jscomp/gentype/EmitType.ml index f2788e978f..7482e1be32 100644 --- a/jscomp/gentype/EmitType.ml +++ b/jscomp/gentype/EmitType.ml @@ -355,20 +355,18 @@ let emitExportType ~(config : Config.t) ~emitters ~nameAs ~opaque ~type_ | true -> "any" | false -> typeVars |> String.concat " | " in - "// tslint:disable-next-line:max-classes-per-file \n" - ^ (match String.capitalize_ascii resolvedTypeName <> resolvedTypeName with - | true -> "// tslint:disable-next-line:class-name\n" - | false -> "") + "// eslint-disable-next-line max-classes-per-file naming-convention\n" ^ docString ^ "export abstract class " ^ resolvedTypeName ^ typeParamsString ^ " { protected opaque!: " ^ typeOfOpaqueField ^ " }; /* simulate opaque types */" ^ exportNameAs |> Emitters.export ~emitters else - (if isInterface && config.exportInterfaces then - docString ^ "export interface " ^ resolvedTypeName ^ typeParamsString ^ " " - else - "// tslint:disable-next-line:interface-over-type-literal\n" ^ docString - ^ "export type " ^ resolvedTypeName ^ typeParamsString ^ " = ") + "// eslint-disable-next-line consistent-type-definitions\n" + ^ (if isInterface && config.exportInterfaces then + docString ^ "export interface " ^ resolvedTypeName ^ typeParamsString + ^ " " + else + docString ^ "export type " ^ resolvedTypeName ^ typeParamsString ^ " = ") ^ (match type_ with | _ -> type_ |> typeToString ~config ~typeNameIsInterface) ^ ";" ^ exportNameAs @@ -388,8 +386,10 @@ let emitRequire ~importedValueOrComponent ~early ~emitters ~(config : Config.t) ~moduleName importPath = let commentBeforeRequire = match importedValueOrComponent with - | true -> "// tslint:disable-next-line:no-var-requires\n" - | false -> "// @ts-ignore: Implicit any on import\n" + | true -> "// eslint-disable-next-line @typescript-eslint/no-var-requires\n" + | false -> + "// eslint-disable-next-line @typescript-eslint/ban-ts-comment\n" + ^ "// @ts-ignore: Implicit any on import\n" in let importPath = match config.moduleResolution with diff --git a/jscomp/gentype_tests/typescript-react-example/.eslintrc.json b/jscomp/gentype_tests/typescript-react-example/.eslintrc.json index fdff2a872b..f0a3514def 100644 --- a/jscomp/gentype_tests/typescript-react-example/.eslintrc.json +++ b/jscomp/gentype_tests/typescript-react-example/.eslintrc.json @@ -1,9 +1,11 @@ { "extends": [ "react-app", + "eslint:recommended", "plugin:@typescript-eslint/recommended" ], "parser": "@typescript-eslint/parser", "plugins": ["@typescript-eslint"], - "ignorePatterns": ["src/**/*.bs.js", "src/**/*.tsx", "src/MyMath.ts"] -} \ No newline at end of file + "ignorePatterns": ["src/**/*.bs.js", "src/**/*.tsx", "src/MyMath.ts"], + "root": true +} diff --git a/jscomp/gentype_tests/typescript-react-example/package-lock.json b/jscomp/gentype_tests/typescript-react-example/package-lock.json index 7cdf52a5ad..241c4c3ae1 100644 --- a/jscomp/gentype_tests/typescript-react-example/package-lock.json +++ b/jscomp/gentype_tests/typescript-react-example/package-lock.json @@ -1,7 +1,7 @@ { "name": "typescript-react-example", "version": "0.1.0", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { @@ -15,56 +15,162 @@ "devDependencies": { "@types/node": "^18.15.12", "@types/react-dom": "^18.0.11", + "@typescript-eslint/eslint-plugin": "^6.8.0", + "@typescript-eslint/parser": "^6.8.0", + "eslint": "^8.51.0", "rescript": "file:../../..", - "typescript": "^5.0.4" + "typescript": "^5.2.2" } }, - "../../..": { - "name": "rescript", - "version": "11.0.0-rc.5", + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", "dev": true, - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.3.0" }, - "devDependencies": { - "mocha": "10.1.0", - "nyc": "15.0.0", - "prettier": "2.7.1" + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.9.1", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.2", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" }, "engines": { - "node": ">=10" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/js": { + "version": "8.51.0", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.11", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.1", + "debug": "^4.1.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.1", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" } }, "node_modules/@rescript/react": { "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.11.0.tgz", - "integrity": "sha512-RzoAO+3cJwXE2D7yodMo4tBO2EkeDYCN/I/Sj/yRweI3S1CY1ZBOF/GMcVtjeIurJJt7KMveqQXTaRrqoGZBBg==", + "license": "MIT", "peerDependencies": { "react": ">=18.0.0", "react-dom": ">=18.0.0" } }, + "node_modules/@types/json-schema": { + "version": "7.0.14", + "dev": true, + "license": "MIT" + }, "node_modules/@types/node": { "version": "18.15.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.12.tgz", - "integrity": "sha512-Wha1UwsB3CYdqUm2PPzh/1gujGCNtWVUYF0mB00fJFoR4gTyWTDPjSm+zBF787Ahw8vSGgBja90MkgFwvB86Dg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/prop-types": { "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/react": { "version": "16.14.30", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.30.tgz", - "integrity": "sha512-tG+xGtDDSuIl1l63mN0LnaROAc99knkYyN4YTheE80iPzYvSy0U8LVie+OBZkrgjVrpkQV6bMCkSphPBnVNk6g==", "dev": true, + "license": "MIT", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -73,192 +179,1360 @@ }, "node_modules/@types/react-dom": { "version": "18.0.11", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.11.tgz", - "integrity": "sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==", "dev": true, + "license": "MIT", "dependencies": { "@types/react": "*" } }, "node_modules/@types/scheduler": { "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", - "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==", - "dev": true + "dev": true, + "license": "MIT" }, - "node_modules/csstype": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz", - "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==", - "dev": true + "node_modules/@types/semver": { + "version": "7.5.3", + "dev": true, + "license": "MIT" }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "6.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.8.0", + "@typescript-eslint/type-utils": "6.8.0", + "@typescript-eslint/utils": "6.8.0", + "@typescript-eslint/visitor-keys": "6.8.0", + "debug": "^4.3.4", + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "node_modules/@typescript-eslint/parser": { + "version": "6.8.0", + "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" + "@typescript-eslint/scope-manager": "6.8.0", + "@typescript-eslint/types": "6.8.0", + "@typescript-eslint/typescript-estree": "6.8.0", + "@typescript-eslint/visitor-keys": "6.8.0", + "debug": "^4.3.4" }, - "bin": { - "loose-envify": "cli.js" + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/react": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", + "node_modules/@typescript-eslint/scope-manager": { + "version": "6.8.0", + "dev": true, + "license": "MIT", "dependencies": { - "loose-envify": "^1.1.0" + "@typescript-eslint/types": "6.8.0", + "@typescript-eslint/visitor-keys": "6.8.0" }, "engines": { - "node": ">=0.10.0" + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/react-dom": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "node_modules/@typescript-eslint/type-utils": { + "version": "6.8.0", + "dev": true, + "license": "MIT", "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.0" + "@typescript-eslint/typescript-estree": "6.8.0", + "@typescript-eslint/utils": "6.8.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "react": "^18.2.0" + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/rescript": { - "resolved": "../../..", - "link": true + "node_modules/@typescript-eslint/types": { + "version": "6.8.0", + "dev": true, + "license": "MIT", + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } }, - "node_modules/scheduler": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", + "node_modules/@typescript-eslint/typescript-estree": { + "version": "6.8.0", + "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "loose-envify": "^1.1.0" + "@typescript-eslint/types": "6.8.0", + "@typescript-eslint/visitor-keys": "6.8.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "node_modules/@typescript-eslint/utils": { + "version": "6.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.8.0", + "@typescript-eslint/types": "6.8.0", + "@typescript-eslint/typescript-estree": "6.8.0", + "semver": "^7.5.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "6.8.0", "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "6.8.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/acorn": { + "version": "8.10.0", + "dev": true, + "license": "MIT", "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" + "acorn": "bin/acorn" }, "engines": { - "node": ">=12.20" + "node": ">=0.4.0" } - } - }, - "dependencies": { - "@rescript/react": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.11.0.tgz", - "integrity": "sha512-RzoAO+3cJwXE2D7yodMo4tBO2EkeDYCN/I/Sj/yRweI3S1CY1ZBOF/GMcVtjeIurJJt7KMveqQXTaRrqoGZBBg==", - "requires": {} }, - "@types/node": { - "version": "18.15.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.12.tgz", - "integrity": "sha512-Wha1UwsB3CYdqUm2PPzh/1gujGCNtWVUYF0mB00fJFoR4gTyWTDPjSm+zBF787Ahw8vSGgBja90MkgFwvB86Dg==", - "dev": true + "node_modules/acorn-jsx": { + "version": "5.3.2", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } }, - "@types/prop-types": { - "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==", - "dev": true + "node_modules/ajv": { + "version": "6.12.6", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } }, - "@types/react": { - "version": "16.14.30", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.30.tgz", - "integrity": "sha512-tG+xGtDDSuIl1l63mN0LnaROAc99knkYyN4YTheE80iPzYvSy0U8LVie+OBZkrgjVrpkQV6bMCkSphPBnVNk6g==", + "node_modules/ansi-regex": { + "version": "5.0.1", "dev": true, - "requires": { - "@types/prop-types": "*", - "@types/scheduler": "*", - "csstype": "^3.0.2" + "license": "MIT", + "engines": { + "node": ">=8" } }, - "@types/react-dom": { - "version": "18.0.11", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.11.tgz", - "integrity": "sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==", + "node_modules/ansi-styles": { + "version": "4.3.0", "dev": true, - "requires": { - "@types/react": "*" + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "@types/scheduler": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", - "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==", - "dev": true + "node_modules/argparse": { + "version": "2.0.1", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/array-union": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "dev": true, + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } }, - "csstype": { + "node_modules/callsites": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz", - "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==", - "dev": true + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "node_modules/chalk": { + "version": "4.1.2", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" + "node_modules/color-convert": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" } }, - "react": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", - "requires": { - "loose-envify": "^1.1.0" + "node_modules/color-name": { + "version": "1.1.4", + "dev": true, + "license": "MIT" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" } }, - "react-dom": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", - "requires": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.0" + "node_modules/csstype": { + "version": "3.1.0", + "dev": true, + "license": "MIT" + }, + "node_modules/debug": { + "version": "4.3.4", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, - "rescript": { - "version": "file:../../..", - "requires": { - "mocha": "10.1.0", - "nyc": "15.0.0", - "prettier": "2.7.1" + "node_modules/deep-is": { + "version": "0.1.4", + "dev": true, + "license": "MIT" + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, - "scheduler": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", - "requires": { - "loose-envify": "^1.1.0" + "node_modules/doctrine": { + "version": "3.0.0", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.51.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "8.51.0", + "@humanwhocodes/config-array": "^0.11.11", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, - "typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", - "dev": true + "node_modules/espree": { + "version": "9.6.1", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.5.0", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-glob": { + "version": "3.3.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.15.0", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.2.9", + "dev": true, + "license": "ISC" + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/glob": { + "version": "7.2.3", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globals": { + "version": "13.23.0", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/graphemer": { + "version": "1.4.0", + "dev": true, + "license": "MIT" + }, + "node_modules/has-flag": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ignore": { + "version": "5.2.4", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "dev": true, + "license": "ISC" + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/keyv": { + "version": "4.5.4", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "dev": true, + "license": "MIT" + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "license": "MIT", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/merge2": { + "version": "1.4.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.5", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "dev": true, + "license": "MIT" + }, + "node_modules/once": { + "version": "1.4.0", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.9.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-type": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/picomatch": { + "version": "2.3.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/punycode": { + "version": "2.3.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/react": { + "version": "18.2.0", + "license": "MIT", + "dependencies": { + "loose-envify": "^1.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-dom": { + "version": "18.2.0", + "license": "MIT", + "dependencies": { + "loose-envify": "^1.1.0", + "scheduler": "^0.23.0" + }, + "peerDependencies": { + "react": "^18.2.0" + } + }, + "node_modules/rescript": { + "version": "11.0.0-rc.4", + "dev": true, + "hasInstallScript": true, + "license": "SEE LICENSE IN LICENSE", + "bin": { + "bsc": "bsc", + "bstracing": "lib/bstracing", + "rescript": "rescript" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/scheduler": { + "version": "0.23.0", + "license": "MIT", + "dependencies": { + "loose-envify": "^1.1.0" + } + }, + "node_modules/semver": { + "version": "7.5.4", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/slash": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "dev": true, + "license": "MIT" + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/ts-api-utils": { + "version": "1.0.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16.13.0" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typescript": { + "version": "5.2.2", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "dev": true, + "license": "ISC" + }, + "node_modules/yallist": { + "version": "4.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } } } } diff --git a/jscomp/gentype_tests/typescript-react-example/package.json b/jscomp/gentype_tests/typescript-react-example/package.json index 8ff3dda051..48e92d95c5 100644 --- a/jscomp/gentype_tests/typescript-react-example/package.json +++ b/jscomp/gentype_tests/typescript-react-example/package.json @@ -2,21 +2,24 @@ "name": "typescript-react-example", "version": "0.1.0", "private": true, - "dependencies": { - "@rescript/react": "^0.11.0", - "react": "^18.2.0", - "react-dom": "^18.2.0" - }, "scripts": { "start": "rescript build -w", "build": "rescript", "clean": "rescript clean", "tsc": "tsc -p tsconfig.json" }, + "dependencies": { + "@rescript/react": "^0.11.0", + "react": "^18.2.0", + "react-dom": "^18.2.0" + }, "devDependencies": { "@types/node": "^18.15.12", "@types/react-dom": "^18.0.11", + "@typescript-eslint/eslint-plugin": "^6.8.0", + "@typescript-eslint/parser": "^6.8.0", + "eslint": "^8.51.0", "rescript": "file:../../..", - "typescript": "^5.0.4" + "typescript": "^5.2.2" } } diff --git a/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.gen.tsx index 88f99dbf1d..6766997986 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.gen.tsx @@ -2,22 +2,22 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type variant = { TAG: "R"; _0: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type record = { readonly variant: variant }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type r2 = { readonly r2: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type r3 = { readonly r3: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type r4 = { readonly r4: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type annotatedVariant = { TAG: "R2"; _0: r2; _1: r3 } | { TAG: "R4"; _0: r4 }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.gen.tsx index 776e9a8f3a..3d7187089e 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.gen.tsx @@ -2,7 +2,7 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type someMutableFields = { mutable0: string; readonly immutable: number; @@ -10,7 +10,7 @@ export type someMutableFields = { mutable2: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type someMethods = { readonly send: (_1:string) => void; readonly on: (_1:string, _2:((_1:number) => void)) => void; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx index 5d3f75e664..131fbedf00 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx @@ -2,20 +2,21 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as CommentsBS__Es6Import from './Comments.bs'; const CommentsBS: any = CommentsBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type DecideSubject_payload = { /** A hint to use as a guide when thinking of your poem. */ readonly hint: string }; -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file naming-convention /** The input used to generate the prompt and system prompt. */ export abstract class DecideSubject_input { protected opaque!: any }; /* simulate opaque types */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions /** The output from evaluating the llm prompt */ export type DecideSubject_output = { /** The text of the poem. */ diff --git a/jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx index 17b7dc2685..705031e310 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx @@ -18,16 +18,16 @@ export const someFunWithNullUndefinedArgTypeChecked: (_1:(null | undefined | str // Export 'someFunWithNullUndefinedArg' early to allow circular import from the '.bs.js' file. export const someFunWithNullUndefinedArg: unknown = someFunWithNullUndefinedArgTypeChecked as (_1:(null | undefined | string), _2:number) => string; -// tslint:disable-next-line:no-var-requires +// eslint-disable-next-line @typescript-eslint/no-var-requires const CoreBS = require('./Core.bs'); -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type variant = "A" | { TAG: "B"; _0: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t1 = { readonly x?: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t2 = { readonly x: (undefined | string) }; export const null0: (x:(null | number)) => (null | number) = CoreBS.null0; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx index 8b26dec8a1..1e8b4f72b0 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx @@ -2,11 +2,12 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as DocstringsBS__Es6Import from './Docstrings.bs'; const DocstringsBS: any = DocstringsBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t = "A" | "B"; /** hello */ diff --git a/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.gen.tsx index 0c8dc66e78..b4b1df32d5 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.gen.tsx @@ -2,11 +2,12 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as EmitModuleIfNoConversionBS__Es6Import from './EmitModuleIfNoConversion.bs'; const EmitModuleIfNoConversionBS: any = EmitModuleIfNoConversionBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t = "A" | { TAG: "B"; readonly name: string }; export const X_foo: (t:t) => void = EmitModuleIfNoConversionBS.X.foo; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx index 127a44dd7d..05815976bc 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx @@ -4,11 +4,12 @@ import * as React from 'react'; +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as ExportWithRenameBS__Es6Import from './ExportWithRename.bs'; const ExportWithRenameBS: any = ExportWithRenameBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Props = { readonly s: string }; export const make: React.ComponentType<{ readonly s: string }> = ExportWithRenameBS.ExportWithRename; diff --git a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.gen.tsx index c77b92708a..7d4d4af27d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.gen.tsx @@ -2,17 +2,18 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as FirstClassModulesBS__Es6Import from './FirstClassModules.bs'; const FirstClassModulesBS: any = FirstClassModulesBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type MT_t = number; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type MT_InnerModule3_inner = number; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type firstClassModule = { readonly x: number; readonly EmptyInnerModule: { diff --git a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.gen.tsx index 3e3ba806f2..bb9b564334 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.gen.tsx @@ -2,14 +2,15 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as FirstClassModulesInterfaceBS__Es6Import from './FirstClassModulesInterface.bs'; const FirstClassModulesInterfaceBS: any = FirstClassModulesInterfaceBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type record = { readonly x: number; readonly y: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type firstClassModule = { readonly x: number }; export const MT_x: number = FirstClassModulesInterfaceBS.MT.x; diff --git a/jscomp/gentype_tests/typescript-react-example/src/GADT.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/GADT.gen.tsx index 8b31a0fa82..734d53f1db 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/GADT.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/GADT.gen.tsx @@ -2,10 +2,8 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:max-classes-per-file -// tslint:disable-next-line:class-name +// eslint-disable-next-line max-classes-per-file naming-convention export abstract class t { protected opaque!: any }; /* simulate opaque types */ -// tslint:disable-next-line:max-classes-per-file -// tslint:disable-next-line:class-name +// eslint-disable-next-line max-classes-per-file naming-convention export abstract class tt { protected opaque!: any }; /* simulate opaque types */ diff --git a/jscomp/gentype_tests/typescript-react-example/src/Hooks.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Hooks.gen.tsx index 9bf99f853c..392879882c 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Hooks.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Hooks.gen.tsx @@ -4,76 +4,77 @@ import * as React from 'react'; +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as HooksBS__Es6Import from './Hooks.bs'; const HooksBS: any = HooksBS__Es6Import; import type {TypedArray2_Uint8Array_t as Js_TypedArray2_Uint8Array_t} from '../src/shims/Js.shim'; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type vehicle = { readonly name: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type cb = (_to:vehicle) => void; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type r = { readonly x: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type callback = (_1:input) => output; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type testReactContext = React.Context; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type testReactRef = { current: (null | number) }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type testDomRef = React.Ref; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type testDomRef2 = React.Ref; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Props = { readonly vehicle: vehicle }; export const $$default: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.default; export default $$default; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Another_anotherComponent_Props = { readonly callback: () => void; readonly vehicle: vehicle }; export const Another_anotherComponent: React.ComponentType<{ readonly callback: () => void; readonly vehicle: vehicle }> = HooksBS.Another.anotherComponent; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Inner_make_Props = { readonly vehicle: vehicle }; export const Inner_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.Inner.make; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Inner_Another_anotherComponent_Props = { readonly vehicle: vehicle }; export const Inner_Another_anotherComponent: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.Inner.Another.anotherComponent; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Inner_Inner2_make_Props = { readonly vehicle: vehicle }; export const Inner_Inner2_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.Inner.Inner2.make; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Inner_Inner2_Another_anotherComponent_Props = { readonly vehicle: vehicle }; export const Inner_Inner2_Another_anotherComponent: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.Inner.Inner2.Another.anotherComponent; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type NoProps_make_Props = {}; export const NoProps_make: React.ComponentType<{}> = HooksBS.NoProps.make; export const functionWithRenamedArgs: (_to:vehicle, _Type:vehicle, cb:cb) => string = HooksBS.functionWithRenamedArgs; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type WithRename_componentWithRenamedArgs_Props = { readonly _Type: vehicle; readonly _to: vehicle; @@ -88,37 +89,37 @@ export const WithRename_componentWithRenamedArgs: React.ComponentType<{ export const WithRef_makeWithRef: (_1:{ readonly vehicle: vehicle }, _2:(null | undefined | any)) => JSX.Element = HooksBS.WithRef.makeWithRef; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type testForwardRef_Props = { readonly vehicle: vehicle }; export const testForwardRef: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.testForwardRef; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type ForwardRef_input_Props = { readonly r: r }; export const ForwardRef_input: React.ComponentType<{ readonly r: r }> = HooksBS.ForwardRef.input; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Poly_polymorphicComponent_Props = { readonly p: [vehicle, T1] }; export const Poly_polymorphicComponent: React.ComponentType<{ readonly p: [vehicle, any] }> = HooksBS.Poly.polymorphicComponent; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Fun_functionReturningReactElement_Props = { readonly name: string }; export const Fun_functionReturningReactElement: React.ComponentType<{ readonly name: string }> = HooksBS.Fun.functionReturningReactElement; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type RenderPropRequiresConversion_make_Props = { readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> }; export const RenderPropRequiresConversion_make: React.ComponentType<{ readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> }> = HooksBS.RenderPropRequiresConversion.make; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type WithChildren_aComponentWithChildren_Props = { readonly children: React.ReactNode; readonly vehicle: vehicle }; export const WithChildren_aComponentWithChildren: React.ComponentType<{ readonly children: React.ReactNode; readonly vehicle: vehicle }> = HooksBS.WithChildren.aComponentWithChildren; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type DD_make_Props = { readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string }; export const DD_make: React.ComponentType<{ readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string }> = HooksBS.DD.make; diff --git a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.gen.tsx index ed21c4c9b3..07d3ce1553 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.gen.tsx @@ -2,5 +2,5 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t = number; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.gen.tsx index 53527ec0de..72b333906f 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.gen.tsx @@ -36,7 +36,7 @@ export const $$default: unknown = defaultTypeChecked as React.ComponentType<{ import type {renderMe as ImportHooks_renderMe} from './ImportHooks.gen'; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type person = { readonly name: string; readonly age: number }; export default $$default; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.gen.tsx index a16f0b9bbe..aa4de6f14a 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.gen.tsx @@ -28,8 +28,8 @@ export const fooTypeChecked: (person:person) => string = fooNotChecked; // Export 'foo' early to allow circular import from the '.bs.js' file. export const foo: unknown = fooTypeChecked as (person:person) => string; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type person = { readonly name: string; readonly age: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type renderMe = React.ComponentType<{ readonly randomString: string; readonly poly: a }>; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx index ea763fd2b5..b8a53b250c 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx @@ -74,7 +74,7 @@ export const defaultTypeChecked: number = defaultNotChecked; // Export '$$default' early to allow circular import from the '.bs.js' file. export const $$default: unknown = defaultTypeChecked as number; -// tslint:disable-next-line:no-var-requires +// eslint-disable-next-line @typescript-eslint/no-var-requires const ImportJsValueBS = require('./ImportJsValue.bs'); import type {AbsoluteValue as $$AbsoluteValue_t} from './MyMath'; @@ -89,33 +89,33 @@ import type {polyType as $$polyType} from './MyMath'; import type {stringFunction as $$stringFunction} from './MyMath'; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type point = { readonly x: number; readonly y: (undefined | number) }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type numberOrString = $$numberOrString; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type AbsoluteValue_t = $$AbsoluteValue_t; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type stringFunction = $$stringFunction; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type color = "tomato" | "gray"; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type variant = { TAG: "I"; _0: number } | { TAG: "S"; _0: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type num = $$num; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type myNum = $$myNum; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type polyType = $$polyType; export const roundedNumber: number = ImportJsValueBS.roundedNumber; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Inherits.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Inherits.gen.tsx index 291711186f..b7cda46b7e 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Inherits.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Inherits.gen.tsx @@ -2,11 +2,11 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type red = "Ruby" | "Redwood" | "Rust"; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type blue = "Sapphire" | "Neon" | "Navy"; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type color = red | blue; diff --git a/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.gen.tsx index 4dc9a9e7c0..ef055ad392 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.gen.tsx @@ -2,11 +2,12 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as InnerModuleSignatureBS__Es6Import from './InnerModuleSignature.bs'; const InnerModuleSignatureBS: any = InnerModuleSignatureBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type InnerModule_t = string; export const InnerModule_make: (_1:InnerModule_t) => string = InnerModuleSignatureBS.InnerModule.make; diff --git a/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx index c99f191185..e80374da73 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx @@ -22,19 +22,19 @@ export const make: unknown = makeTypeChecked as React.ComponentType<{ readonly renderMe: renderMe }>; -// tslint:disable-next-line:no-var-requires +// eslint-disable-next-line @typescript-eslint/no-var-requires const JSXV4BS = require('./JSXV4.bs'); -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type CompV4_props = { readonly x: x; readonly y: y }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type person = { readonly name: string; readonly age: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type renderMe = React.ComponentType<{ readonly randomString: string; readonly poly: a }>; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type props = { readonly actions?: actions; readonly person: person; @@ -44,7 +44,7 @@ export type props = { export const CompV4_make: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4BS.CompV4.make; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Props = { readonly x: string; readonly y: string }; export const CompV3_make: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4BS.CompV3.make; diff --git a/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.gen.tsx index 1d9c03e505..9c1b11bb5b 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as LabeledFunBS__Es6Import from './LabeledFun.bs'; const LabeledFunBS: any = LabeledFunBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.gen.tsx index 3f53e178e7..8463820736 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as LetPrivateBS__Es6Import from './LetPrivate.bs'; const LetPrivateBS: any = LetPrivateBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Machine.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Machine.gen.tsx index da11ae974b..cbd79c92f5 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Machine.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Machine.gen.tsx @@ -2,11 +2,12 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as MachineBS__Es6Import from './Machine.bs'; const MachineBS: any = MachineBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type aa = { TAG: "A"; _0: number }; export const a: aa = MachineBS.a; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.gen.tsx index 3dd54ab8a2..4cc6932c54 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.gen.tsx @@ -2,29 +2,30 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as ModuleAliasesBS__Es6Import from './ModuleAliases.bs'; const ModuleAliasesBS: any = ModuleAliasesBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Outer_Inner_innerT = { readonly inner: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Outer2_Inner2_InnerNested_t = { readonly nested: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Outer2_OuterInnerAlias_innerT = Outer_Inner_innerT; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Outer2_Inner2_OuterInnerAlias2_innerT = Outer2_OuterInnerAlias_innerT; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Outer2Alias_OuterInnerAlias_innerT = Outer2_OuterInnerAlias_innerT; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Outer2Alias_Inner2_OuterInnerAlias2_innerT = Outer2_Inner2_OuterInnerAlias2_innerT; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type InnerNestedAlias_t = Outer2_Inner2_InnerNested_t; export const testNested: (x:InnerNestedAlias_t) => InnerNestedAlias_t = ModuleAliasesBS.testNested; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.gen.tsx index 16560b745a..d11a2a7b88 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.gen.tsx @@ -2,20 +2,20 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type record = { readonly x: number; readonly y: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Outer_outer = { readonly outer: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Outer_Inner_inner = { readonly inner: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type OuterAlias_outer = Outer_outer; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type OuterAlias_Inner_inner = Outer_Inner_inner; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type InnerAlias_inner = OuterAlias_Inner_inner; diff --git a/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.gen.tsx index 8095a4b284..fb2f84fe3c 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.gen.tsx @@ -2,14 +2,15 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as MoreVariantsBS__Es6Import from './MoreVariants.bs'; const MoreVariantsBS: any = MoreVariantsBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type withRenaming = "type_" | "b"; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type withoutRenaming = "type_" | "b"; export const testWithRenaming: (x:withRenaming) => withRenaming = MoreVariantsBS.testWithRenaming; diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyInput.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/MyInput.gen.tsx index 43af5fc54a..3322d2d25a 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/MyInput.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/MyInput.gen.tsx @@ -12,7 +12,7 @@ export const $$default: unknown = defaultTypeChecked as React.ComponentType<{ re import type {inputFocusEvent as $$inputFocusEvent} from './shims/ReactEvent.shim'; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type inputFocusEvent = $$inputFocusEvent; export default $$default; diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyModule.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/MyModule.gen.tsx index e9acb394ff..8a20bc23a9 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/MyModule.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/MyModule.gen.tsx @@ -2,11 +2,12 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as MyModuleBS__Es6Import from './MyModule.bs'; const MyModuleBS: any = MyModuleBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t = number; export const add: (a:t, b:t) => t = MyModuleBS.add; diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedModules.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NestedModules.gen.tsx index 8a58e86616..f8945fdd6d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/NestedModules.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/NestedModules.gen.tsx @@ -2,20 +2,21 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as NestedModulesBS__Es6Import from './NestedModules.bs'; const NestedModulesBS: any = NestedModulesBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Universe_nestedType = string[]; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Universe_Nested2_nested2Type = Array; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Universe_Nested2_Nested3_nested3Type = Array>; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Universe_variant = "A" | { TAG: "B"; _0: string }; export const notNested: number = NestedModulesBS.notNested; diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.gen.tsx index bbdda05a1f..3d2ef4147e 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as NestedModulesInSignatureBS__Es6Import from './NestedModulesInSignature.bs'; const NestedModulesInSignatureBS: any = NestedModulesInSignatureBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.gen.tsx index 6d33f6cfce..c84e202c67 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.gen.tsx @@ -2,56 +2,57 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as NestedVariantsBS__Es6Import from './NestedVariants.bs'; const NestedVariantsBS: any = NestedVariantsBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type typeL = { TAG: "NonUnary"; _0: number; _1: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type typeC = { TAG: "C"; _0: string } | { TAG: "D"; _0: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type typeB = { readonly c: typeC }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type typeD = { TAG: "Int"; _0: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type typeE = number; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type typeA = { TAG: "A"; _0: a; _1: number } | { TAG: "B"; _0: a; _1: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type typeF = { TAG: "F"; _0: a } | { TAG: "G"; _0: a }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type typeH = { TAG: "H"; _0: typeD; _1: number } | { TAG: "I"; _0: typeD; _1: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type typeJ = { TAG: "J"; _0: typeD; _1: typeD }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type typeK = { TAG: "K"; _0: typeD; _1: typeD }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type boxedBinary = { TAG: "BB"; _0: typeD; _1: number } | { TAG: "Z"; _0: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type unboxedBinary = { TAG: "UB"; _0: typeD; _1: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type inline = { TAG: "I"; readonly i: number; readonly j: number } | { TAG: "J"; readonly i: number; readonly j: number } diff --git a/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.gen.tsx index 98354a6d4c..0a47e8a3fe 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.gen.tsx @@ -2,11 +2,11 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type notRecursive = number; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type M_notRecursive = notRecursive[]; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type M_recursive = { readonly self: M_recursive }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.gen.tsx index ef9a5eea2d..fdc8736765 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.gen.tsx @@ -2,5 +2,5 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t = 12 | 0 | "b"; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Object.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Object.gen.tsx index 31cd17915e..540beea977 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Object.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Object.gen.tsx @@ -2,8 +2,8 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type someType = { readonly crop?: string; readonly "fp-z"?: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type someType2 = { readonly crop: (undefined | string); readonly "fp-z": (undefined | string) }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/OnClick2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/OnClick2.gen.tsx index 98e003b9be..fba707dabd 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/OnClick2.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/OnClick2.gen.tsx @@ -4,11 +4,12 @@ import * as React from 'react'; +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as OnClick2BS__Es6Import from './OnClick2.bs'; const OnClick2BS: any = OnClick2BS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type Props = { readonly onClick: (_1:MouseEvent) => void }; export const make: React.ComponentType<{ readonly onClick: (_1:MouseEvent) => void }> = OnClick2BS.make; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Opaque.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Opaque.gen.tsx index 633c0d30b8..d2d257e9b9 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Opaque.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Opaque.gen.tsx @@ -2,17 +2,17 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as OpaqueBS__Es6Import from './Opaque.bs'; const OpaqueBS: any = OpaqueBS__Es6Import; import type {business as Records_business} from './Records.gen'; -// tslint:disable-next-line:max-classes-per-file -// tslint:disable-next-line:class-name +// eslint-disable-next-line max-classes-per-file naming-convention export abstract class opaqueFromRecords { protected opaque!: any }; /* simulate opaque types */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type pair = [opaqueFromRecords, opaqueFromRecords]; export const noConversion: (x:opaqueFromRecords) => opaqueFromRecords = OpaqueBS.noConversion; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Records.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Records.gen.tsx index ef6d6b7615..701fb163a2 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Records.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Records.gen.tsx @@ -2,47 +2,48 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as RecordsBS__Es6Import from './Records.bs'; const RecordsBS: any = RecordsBS__Es6Import; import type {list} from '../src/shims/RescriptPervasives.shim'; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type coord = { readonly x: number; readonly y: number; readonly z: (undefined | number) }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type person = { readonly name: string; readonly age: number; readonly address: (undefined | string) }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type business = { readonly name: string; readonly owner: (undefined | person); readonly address: (undefined | string) }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type payload = { readonly num: number; readonly payload: a }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type record = { readonly v: number; readonly w: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type business2 = { readonly name: string; readonly owner: (null | undefined | person); readonly address2: (null | undefined | string) }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type mix = { readonly a: number; readonly b: number; @@ -52,13 +53,13 @@ export type mix = { } }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type myRec = { readonly type: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type myObj = { readonly type_: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type myRecBsAs = { readonly jsValid0: string; readonly type: string; diff --git a/jscomp/gentype_tests/typescript-react-example/src/References.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/References.gen.tsx index ee18c0af0f..c0c5f48747 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/References.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/References.gen.tsx @@ -2,17 +2,18 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as ReferencesBS__Es6Import from './References.bs'; const ReferencesBS: any = ReferencesBS__Es6Import; -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file naming-convention export abstract class R_t { protected opaque!: a }; /* simulate opaque types */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t = R_t; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type requiresConversion = { readonly x: number }; export const create: (x:number) => { contents: number } = ReferencesBS.create; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Shadow.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Shadow.gen.tsx index 491426e9f7..9ec46fd63d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Shadow.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Shadow.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as ShadowBS__Es6Import from './Shadow.bs'; const ShadowBS: any = ShadowBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.gen.tsx index f6f0527f44..f924a573c6 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as TestEmitInnerModulesBS__Es6Import from './TestEmitInnerModules.bs'; const TestEmitInnerModulesBS: any = TestEmitInnerModulesBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.gen.tsx index 6c80daffb0..46feba73d3 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as TestFirstClassModulesBS__Es6Import from './TestFirstClassModules.bs'; const TestFirstClassModulesBS: any = TestFirstClassModulesBS__Es6Import; @@ -12,7 +13,7 @@ import type {firstClassModule as FirstClassModules_firstClassModule} from './Fir import type {record as FirstClassModulesInterface_record} from './FirstClassModulesInterface.gen'; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type firstClassModuleWithTypeEquations = { readonly out: (_1:o) => o; readonly Inner: { readonly inn: (_1:i) => i } }; export const convert: (x:FirstClassModules_firstClassModule) => FirstClassModules_firstClassModule = TestFirstClassModulesBS.convert; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx index 6ea14f6e0f..9ba03d0981 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as TestImmutableArrayBS__Es6Import from './TestImmutableArray.bs'; const TestImmutableArrayBS: any = TestImmutableArrayBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.gen.tsx index 3c5e717c8c..8801b8f1c2 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as TestModuleAliasesBS__Es6Import from './TestModuleAliases.bs'; const TestModuleAliasesBS: any = TestModuleAliasesBS__Es6Import; @@ -14,28 +15,28 @@ import type {Outer_outer as ModuleAliases2_Outer_outer} from './ModuleAliases2.g import type {record as ModuleAliases2_record} from './ModuleAliases2.gen'; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type OtherFile_record = { readonly x: number; readonly y: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type record = ModuleAliases2_record; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type record2 = ModuleAliases2_record; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type outer = ModuleAliases2_Outer_outer; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type outer2 = ModuleAliases2_Outer_outer; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type my2 = ModuleAliases2_Outer_Inner_inner; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type inner1 = ModuleAliases2_InnerAlias_inner; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type inner2 = ModuleAliases2_Outer_Inner_inner; export const testInner1: (x:inner1) => inner1 = TestModuleAliasesBS.testInner1; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx index 8aef01e6ce..d97f58e09d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx @@ -2,17 +2,18 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as TestPromiseBS__Es6Import from './TestPromise.bs'; const TestPromiseBS: any = TestPromiseBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type promise = Promise; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type fromPayload = { readonly x: number; readonly s: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type toPayload = { readonly result: string }; export const convert: (_1:Promise) => Promise = TestPromiseBS.convert; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx index 7d343e4543..1928bc2db1 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as TransitiveType1BS__Es6Import from './TransitiveType1.bs'; const TransitiveType1BS: any = TransitiveType1BS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.gen.tsx index 0ccf1b920c..6bbc5469a0 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.gen.tsx @@ -4,8 +4,8 @@ import type {t3 as TransitiveType3_t3} from './TransitiveType3.gen'; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t2 = (undefined | TransitiveType3_t3); -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t2Alias = t2; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.gen.tsx index a377a845af..dd8236816a 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.gen.tsx @@ -2,11 +2,12 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as TransitiveType3BS__Es6Import from './TransitiveType3.bs'; const TransitiveType3BS: any = TransitiveType3BS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t3 = { readonly i: number; readonly s: string }; export const convertT3: (x:t3) => t3 = TransitiveType3BS.convertT3; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.gen.tsx index a83402c199..246f51d0ed 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.gen.tsx @@ -2,11 +2,11 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t_ = number; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type M_t__ = number; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type pair = [t_, M_t__]; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.gen.tsx index 30cb971b21..17f11a4d4b 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.gen.tsx @@ -2,5 +2,5 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type ocaml_array = a[]; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.gen.tsx index 976be0ebad..304a9b6abf 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.gen.tsx @@ -4,11 +4,11 @@ import type {ocaml_array as TypeParams1_ocaml_array} from './TypeParams1.gen'; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type item = { readonly id: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type items = TypeParams1_ocaml_array; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type items2 = item[]; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.gen.tsx index 5347b93ec3..641d869dbf 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as TypeParams3BS__Es6Import from './TypeParams3.bs'; const TypeParams3BS: any = TypeParams3BS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Unboxed.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Unboxed.gen.tsx index e1a45ac733..331a1bc46f 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Unboxed.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Unboxed.gen.tsx @@ -2,23 +2,24 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as UnboxedBS__Es6Import from './Unboxed.bs'; const UnboxedBS: any = UnboxedBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type v1 = number; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type v2 = number; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type r1 = number; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type r2 = string; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t = number[] | number | ((_1:number) => number); export const testV1: (x:v1) => v1 = UnboxedBS.testV1; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Uncurried.gen.tsx index aec96f4a1e..0a9a42065e 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Uncurried.gen.tsx @@ -2,26 +2,27 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as UncurriedBS__Es6Import from './Uncurried.bs'; const UncurriedBS: any = UncurriedBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type u0 = () => string; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type u1 = (_1:number) => string; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type u2 = (_1:number, _2:string) => string; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type u3 = (_1:number, _2:string, _3:number) => string; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type auth = { readonly login: () => string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type authU = { readonly loginU: () => string }; export const uncurried0: () => string = UncurriedBS.uncurried0; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Usage.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Usage.gen.tsx index 383e5d732c..907a73d79f 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Usage.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Usage.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as UsageBS__Es6Import from './Usage.bs'; const UsageBS: any = UsageBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.gen.tsx index f9e5f95da8..977e69edae 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as UseImportJsValueBS__Es6Import from './UseImportJsValue.bs'; const UseImportJsValueBS: any = UseImportJsValueBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.gen.tsx index 9fdfc8bebd..c528cfade0 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.gen.tsx @@ -2,5 +2,5 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type cb = (_1:number) => string; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx index 4adf4f1588..ecf327f5d1 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx @@ -2,13 +2,14 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as VariantsBS__Es6Import from './Variants.bs'; const VariantsBS: any = VariantsBS__Es6Import; import type {list} from '../src/shims/RescriptPervasives.shim'; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type weekday = "monday" | "tuesday" @@ -18,42 +19,42 @@ export type weekday = | "saturday" | "sunday"; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type testGenTypeAs = "type_" | "module_" | "fortytwo"; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type testGenTypeAs2 = "type_" | "module" | 42; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type testGenTypeAs3 = "type_" | "module" | 42; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type x1 = "x" | "x1"; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type x2 = "x" | "x2"; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type type_ = "Type"; export type type = type_; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type myList = "E" | { TAG: "C"; _0: number; _1: myList }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type builtinList = list; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type result1 = { TAG: "Ok"; _0: a } | { TAG: "Error"; _0: b }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type result2 = { TAG: "Ok"; _0: a } | { TAG: "Error"; _0: b }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type result3 = { TAG: "Ok"; _0: a } | { TAG: "Error"; _0: b }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.gen.tsx index 4420b28595..f52c2c780a 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.gen.tsx @@ -2,14 +2,15 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as VariantsWithPayloadBS__Es6Import from './VariantsWithPayload.bs'; const VariantsWithPayloadBS: any = VariantsWithPayloadBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type payload = { readonly x: number; readonly y?: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type withPayload = "a" | "b" @@ -18,16 +19,16 @@ export type withPayload = | "Half" | { NAME: "c"; VAL: payload }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type manyPayloads = { NAME: "one"; VAL: number } | { NAME: "two"; VAL: [string, string] } | { NAME: "three"; VAL: payload }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type simpleVariant = "A" | "B" | "C"; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type variantWithPayloads = "A" | { TAG: "B"; _0: number } @@ -35,10 +36,10 @@ export type variantWithPayloads = | { TAG: "D"; _0: number; _1: number } | { TAG: "E"; _0: number; _1: string; _2: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type variant1Int = { TAG: "R"; _0: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type variant1Object = { TAG: "R"; _0: payload }; export const testWithPayload: (x:withPayload) => withPayload = VariantsWithPayloadBS.testWithPayload; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx index ba56d1cfc8..c74f5978a2 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as WarningsBS__Es6Import from './Warnings.bs'; const WarningsBS: any = WarningsBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Wrapper.gen.tsx index 27ab2e87ef..17b81e8930 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Wrapper.gen.tsx @@ -2,11 +2,12 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as WrapperBS__Es6Import from './Wrapper.bs'; const WrapperBS: any = WrapperBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type MyModuleAlias_t = number; export const MyModuleAlias_add: (_1:MyModuleAlias_t, _2:MyModuleAlias_t) => MyModuleAlias_t = WrapperBS.MyModuleAlias.add; diff --git a/jscomp/gentype_tests/typescript-react-example/src/counter.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/counter.gen.tsx index 58a59a93e3..a550481c9d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/counter.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/counter.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as counterBS__Es6Import from './counter.bs'; const counterBS: any = counterBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/location/location.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/location/location.gen.tsx index 50e96e2889..40ee0818c3 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/location/location.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/location/location.gen.tsx @@ -2,5 +2,5 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t = { readonly id: string; readonly name: string }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.gen.tsx index 1419d29251..14dc1dc709 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.gen.tsx @@ -2,20 +2,21 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as TuplesBS__Es6Import from './Tuples.bs'; const TuplesBS: any = TuplesBS__Es6Import; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type coord = [number, number, (undefined | number)]; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type coord2 = [number, number, (null | undefined | number)]; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type person = { readonly name: string; readonly age: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type couple = [person, person]; export const testTuple: (param:[number, number]) => number = TuplesBS.testTuple; diff --git a/jscomp/gentype_tests/typescript-react-example/src/nested/Types.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/nested/Types.gen.tsx index 7f7da2be5a..67c489e63d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/nested/Types.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/nested/Types.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as TypesBS__Es6Import from './Types.bs'; const TypesBS: any = TypesBS__Es6Import; @@ -16,56 +17,55 @@ import type {t_ as TypeNameSanitize_t_} from '../../src/TypeNameSanitize.gen'; import type {t as Location_t} from '../../src/location/location.gen'; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t = number; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type typeWithVars = { TAG: "A"; _0: x; _1: y } | { TAG: "B"; _0: z }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type tree = { readonly label: string; readonly left?: tree; readonly right?: tree }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type selfRecursive = { readonly self: selfRecursive }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type mutuallyRecursiveA = { readonly b: mutuallyRecursiveB }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type mutuallyRecursiveB = { readonly a: mutuallyRecursiveA }; -// tslint:disable-next-line:max-classes-per-file -// tslint:disable-next-line:class-name +// eslint-disable-next-line max-classes-per-file naming-convention export abstract class opaqueVariant { protected opaque!: any }; /* simulate opaque types */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type twice = [a, a]; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type genTypeMispelled = number; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type dictString = {[id: string]: string}; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type nullOrString = (null | string); -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type nullOrString2 = (null | string); -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type record = { readonly i: number; readonly s: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type decorator = (_1:a) => b; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type marshalFields = { readonly _rec: string; readonly _switch: string; @@ -78,35 +78,35 @@ export type marshalFields = { readonly _Uppercase__: string }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type marshalMutableField = { _match: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type ocaml_array = a[]; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type someRecord = { readonly id: number }; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type instantiateTypeParameter = ocaml_array; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type vector = [a, a]; export type Vector = vector; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type date = Date; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type i64A = [number, number]; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type i64B = [number, number]; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type ObjectId_t = number; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type tPrimed = [TypeNameSanitize_t_, TypeNameSanitize_M_t__]; export const someIntList: list = TypesBS.someIntList; diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.gen.tsx index 4fc6d2bb6b..9e60031766 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as _404BS__Es6Import from './404.bs'; const _404BS: any = _404BS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.gen.tsx index 6860883adf..784765575a 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as AppModal_webBS__Es6Import from './AppModal.web.bs'; const AppModal_webBS: any = AppModal_webBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.gen.tsx index faf6961b6e..737f1e3df0 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as _underBS__Es6Import from './_under.bs'; const _underBS: any = _underBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.gen.tsx index 7a0c3e8c9f..eb44a28a17 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.gen.tsx @@ -2,6 +2,7 @@ /* eslint-disable import/first */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore: Implicit any on import import * as with_underscoreBS__Es6Import from './with_underscore.bs'; const with_underscoreBS: any = with_underscoreBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/tslint.json b/jscomp/gentype_tests/typescript-react-example/tslint.json deleted file mode 100644 index 24b0d5b1f7..0000000000 --- a/jscomp/gentype_tests/typescript-react-example/tslint.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": ["tslint:recommended", "tslint-react", "tslint-config-prettier"], - "defaultSeverity": "warning", - "linterOptions": { - "exclude": [ - "config/**/*.js", - "node_modules/**/*.ts", - "src/**/*.bs.js" - ] - } -} diff --git a/jscomp/syntax/tests/idempotency/genType/src/EmitType.res b/jscomp/syntax/tests/idempotency/genType/src/EmitType.res index f603693d1a..ea04291541 100644 --- a/jscomp/syntax/tests/idempotency/genType/src/EmitType.res +++ b/jscomp/syntax/tests/idempotency/genType/src/EmitType.res @@ -479,7 +479,7 @@ let emitRequire = ( importPath, ) => { let commentBeforeRequire = switch config.language { - | TypeScript => "// tslint:disable-next-line:no-var-requires\n" + | TypeScript => "// eslint-disable-next-line @typescript-eslint/no-var-requires\n" | Flow => strict ? early ? "// flowlint-next-line nonstrict-import:off\n" : "" : flowExpectedError | Untyped => "" } diff --git a/jscomp/test/variantsMatching.gen.tsx b/jscomp/test/variantsMatching.gen.tsx index 023a483cec..7f3377cea2 100644 --- a/jscomp/test/variantsMatching.gen.tsx +++ b/jscomp/test/variantsMatching.gen.tsx @@ -2,23 +2,23 @@ /* eslint-disable import/first */ -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type t = "thisIsA" | 42 | null | "D" | 3.14; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type tNU = null | undefined; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type MyUndefined_t = undefined | a; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type MyNull_t = null | a; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type MyNullable_t = null | undefined | a; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type MyNullableExtended_t = null | undefined | "WhyNotAnotherOne" | a; -// tslint:disable-next-line:interface-over-type-literal +// eslint-disable-next-line consistent-type-definitions export type UntaggedWithBool_t = string | number | boolean | string; From 7fa290a6b940a0e9323a3d4409c791bc5f3cf1e6 Mon Sep 17 00:00:00 2001 From: Hyeseong Kim Date: Thu, 19 Oct 2023 02:42:34 +0900 Subject: [PATCH 2/8] add CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6e760f6db..d437b811b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ # 11.0.0-rc.5 (Unreleased) +#### :boom: Breaking Change + +- Gentype now emits comments to suppress warnings from [`@typescript-eslint/plugin`](https://typescript-eslint.io/) instead of TSLint. https://github.com/rescript-lang/rescript-compiler/pull/6442 + #### :bug: Bug Fix - Fix issue with dynamic import of module in nested expressions https://github.com/rescript-lang/rescript-compiler/pull/6431 From 6d3789143bd9aeba859bf38214191118a09b942e Mon Sep 17 00:00:00 2001 From: Hyeseong Kim Date: Thu, 19 Oct 2023 02:52:36 +0900 Subject: [PATCH 3/8] fix format --- jscomp/gentype/EmitType.ml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jscomp/gentype/EmitType.ml b/jscomp/gentype/EmitType.ml index 7482e1be32..3deb3d2cf3 100644 --- a/jscomp/gentype/EmitType.ml +++ b/jscomp/gentype/EmitType.ml @@ -183,8 +183,7 @@ let rec renderType ~(config : Config.t) ?(indent = None) ~typeNameIsInterface in let tagField = case |> labelJSToString - |> field - ~name:(Runtime.jsVariantTag ~polymorphic:false ~tag) + |> field ~name:(Runtime.jsVariantTag ~polymorphic:false ~tag) in match (unboxed, type_) with | true, type_ -> From 388fded88e4eb87113d5ea0c99b82f83a5a3f8f4 Mon Sep 17 00:00:00 2001 From: Hyeseong Kim Date: Thu, 19 Oct 2023 04:56:17 +0900 Subject: [PATCH 4/8] check lint on test --- jscomp/gentype_tests/typescript-react-example/.eslintrc.json | 1 - jscomp/gentype_tests/typescript-react-example/Makefile | 1 + jscomp/gentype_tests/typescript-react-example/package.json | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jscomp/gentype_tests/typescript-react-example/.eslintrc.json b/jscomp/gentype_tests/typescript-react-example/.eslintrc.json index f0a3514def..4fb9aec608 100644 --- a/jscomp/gentype_tests/typescript-react-example/.eslintrc.json +++ b/jscomp/gentype_tests/typescript-react-example/.eslintrc.json @@ -1,6 +1,5 @@ { "extends": [ - "react-app", "eslint:recommended", "plugin:@typescript-eslint/recommended" ], diff --git a/jscomp/gentype_tests/typescript-react-example/Makefile b/jscomp/gentype_tests/typescript-react-example/Makefile index ebd7a84182..284dbe2eae 100644 --- a/jscomp/gentype_tests/typescript-react-example/Makefile +++ b/jscomp/gentype_tests/typescript-react-example/Makefile @@ -4,6 +4,7 @@ test: npm install npm run build npm run tsc + npm run lint clean: rm -rf node_modules lib src/*.bs.js src/*.gen.tsx diff --git a/jscomp/gentype_tests/typescript-react-example/package.json b/jscomp/gentype_tests/typescript-react-example/package.json index 48e92d95c5..2bd24b2215 100644 --- a/jscomp/gentype_tests/typescript-react-example/package.json +++ b/jscomp/gentype_tests/typescript-react-example/package.json @@ -6,7 +6,8 @@ "start": "rescript build -w", "build": "rescript", "clean": "rescript clean", - "tsc": "tsc -p tsconfig.json" + "tsc": "tsc -p tsconfig.json", + "lint": "eslint src" }, "dependencies": { "@rescript/react": "^0.11.0", From c0f8452d305a3d9e06886ece3180342b00b84f4b Mon Sep 17 00:00:00 2001 From: Hyeseong Kim Date: Thu, 19 Oct 2023 04:56:26 +0900 Subject: [PATCH 5/8] fix shims --- .../src/shims/ReactEvent.shim.ts | 28 +++++++++---------- .../src/shims/RescriptPervasives.shim.ts | 10 ++++--- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/jscomp/gentype_tests/typescript-react-example/src/shims/ReactEvent.shim.ts b/jscomp/gentype_tests/typescript-react-example/src/shims/ReactEvent.shim.ts index 994e10e1e3..4ad7494fa1 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/shims/ReactEvent.shim.ts +++ b/jscomp/gentype_tests/typescript-react-example/src/shims/ReactEvent.shim.ts @@ -1,69 +1,69 @@ -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Animation_t { protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Clipboard_t { protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Composition_t { protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Focus_t { protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Form_t { protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Keyboard_t { protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Image_t { protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Media_t { protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Selection_t { protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Synthetic_t { protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Touch_t { protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Transition_t { protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class UI_t { protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Wheel_t { protected opaque: unknown; } diff --git a/jscomp/gentype_tests/typescript-react-example/src/shims/RescriptPervasives.shim.ts b/jscomp/gentype_tests/typescript-react-example/src/shims/RescriptPervasives.shim.ts index 3e6ba0ac25..d83f49ce57 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/shims/RescriptPervasives.shim.ts +++ b/jscomp/gentype_tests/typescript-react-example/src/shims/RescriptPervasives.shim.ts @@ -1,12 +1,12 @@ -// tslint:disable-next-line:no-var-requires +// eslint-disable-next-line @typescript-eslint/no-var-requires const $$Array = require("bs-platform/lib/js/array"); -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class EmptyList { - protected opaque: any; + protected opaque: unknown; } -// tslint:disable-next-line:max-classes-per-file +// eslint-disable-next-line max-classes-per-file export abstract class Cons { protected opaque!: T; } @@ -14,9 +14,11 @@ export abstract class Cons { export type list = Cons | EmptyList; export function cons(itm: T, lst: list) : list { + // eslint-disable-next-line @typescript-eslint/no-explicit-any return /* :: */ [itm, lst] as any; } +// eslint-disable-next-line @typescript-eslint/no-explicit-any export const emptyList : EmptyList = /* [] */ 0 as any; export const fromArray = $$Array.to_list; From 62678c1b138449f0664eefa502204c07f86f8d8b Mon Sep 17 00:00:00 2001 From: Hyeseong Kim Date: Thu, 19 Oct 2023 05:15:57 +0900 Subject: [PATCH 6/8] fix lint config --- jscomp/gentype_tests/typescript-react-example/.eslintrc.json | 2 +- jscomp/gentype_tests/typescript-react-example/src/MyMath.ts | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/jscomp/gentype_tests/typescript-react-example/.eslintrc.json b/jscomp/gentype_tests/typescript-react-example/.eslintrc.json index 4fb9aec608..d0b868ecfa 100644 --- a/jscomp/gentype_tests/typescript-react-example/.eslintrc.json +++ b/jscomp/gentype_tests/typescript-react-example/.eslintrc.json @@ -5,6 +5,6 @@ ], "parser": "@typescript-eslint/parser", "plugins": ["@typescript-eslint"], - "ignorePatterns": ["src/**/*.bs.js", "src/**/*.tsx", "src/MyMath.ts"], + "ignorePatterns": ["src/**/*.bs.js"], "root": true } diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyMath.ts b/jscomp/gentype_tests/typescript-react-example/src/MyMath.ts index 5e4c987b26..dc485d33a2 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/MyMath.ts +++ b/jscomp/gentype_tests/typescript-react-example/src/MyMath.ts @@ -4,7 +4,6 @@ export const round: (_: number) => number = Math.round; export const round2 = round; -// tslint:disable-next-line:only-arrow-functions export const area = function(point: { x: number; y?: number }): number { return point.x * (point.y === undefined ? 1 : point.y); }; @@ -27,7 +26,6 @@ export class AbsoluteValue { export type stringFunction = (_: string) => string; -// tslint:disable-next-line:only-arrow-functions export const useColor = function(x: "tomato" | "gray"): number { return 0; }; From f84e388dbf26ccc65ee85592abfd388bf7d63dea Mon Sep 17 00:00:00 2001 From: Hyeseong Kim Date: Thu, 19 Oct 2023 05:59:11 +0900 Subject: [PATCH 7/8] disable lint for whole file --- CHANGELOG.md | 5 +- jscomp/gentype/EmitType.ml | 30 +- .../package-lock.json | 494 +++++++++++------- .../src/AutoAnnotate.gen.tsx | 9 +- .../src/BucklescriptAnnotations.gen.tsx | 5 +- .../src/Comments.gen.tsx | 8 +- .../typescript-react-example/src/Core.gen.tsx | 7 +- .../src/Docstrings.gen.tsx | 6 +- .../src/EmitModuleIfNoConversion.gen.tsx | 6 +- .../src/ExportWithRename.gen.tsx | 6 +- .../src/FirstClassModules.gen.tsx | 8 +- .../src/FirstClassModulesInterface.gen.tsx | 7 +- .../typescript-react-example/src/GADT.gen.tsx | 5 +- .../src/Hooks.gen.tsx | 28 +- .../src/IgnoreInterface.gen.tsx | 4 +- .../src/ImportHookDefault.gen.tsx | 4 +- .../src/ImportHooks.gen.tsx | 5 +- .../src/ImportIndex.gen.tsx | 3 +- .../src/ImportJsValue.gen.tsx | 13 +- .../src/Inherits.gen.tsx | 6 +- .../src/InnerModuleSignature.gen.tsx | 6 +- .../src/JSXV4.gen.tsx | 9 +- .../src/LabeledFun.gen.tsx | 5 +- .../src/LetPrivate.gen.tsx | 5 +- .../typescript-react-example/src/Lib.gen.tsx | 4 +- .../src/Machine.gen.tsx | 6 +- .../src/ModuleAliases.gen.tsx | 12 +- .../src/ModuleAliases2.gen.tsx | 9 +- .../src/MoreVariants.gen.tsx | 7 +- .../src/MyInput.gen.tsx | 4 +- .../typescript-react-example/src/MyMath.ts | 2 + .../src/MyModule.gen.tsx | 6 +- .../src/NestedModules.gen.tsx | 9 +- .../src/NestedModulesInSignature.gen.tsx | 5 +- .../src/NestedVariants.gen.tsx | 18 +- .../src/NonrecursiveTypes.gen.tsx | 6 +- .../src/NumericPolyVar.gen.tsx | 4 +- .../src/Object.gen.tsx | 5 +- .../src/OnClick2.gen.tsx | 6 +- .../src/Opaque.gen.tsx | 7 +- .../src/Records.gen.tsx | 15 +- .../src/References.gen.tsx | 8 +- .../src/Shadow.gen.tsx | 5 +- .../src/TestEmitInnerModules.gen.tsx | 5 +- .../src/TestFirstClassModules.gen.tsx | 6 +- .../src/TestImmutableArray.gen.tsx | 5 +- .../src/TestModuleAliases.gen.tsx | 13 +- .../src/TestPromise.gen.tsx | 8 +- .../src/TransitiveType1.gen.tsx | 5 +- .../src/TransitiveType2.gen.tsx | 5 +- .../src/TransitiveType3.gen.tsx | 6 +- .../src/TypeNameSanitize.gen.tsx | 6 +- .../src/TypeParams1.gen.tsx | 4 +- .../src/TypeParams2.gen.tsx | 6 +- .../src/TypeParams3.gen.tsx | 5 +- .../src/Unboxed.gen.tsx | 10 +- .../src/Uncurried.gen.tsx | 11 +- .../src/Usage.gen.tsx | 5 +- .../src/UseImportJsValue.gen.tsx | 5 +- .../src/V3Compatibility.gen.tsx | 4 +- .../src/Variants.gen.tsx | 17 +- .../src/VariantsWithPayload.gen.tsx | 12 +- .../src/Warnings.gen.tsx | 5 +- .../src/Wrapper.gen.tsx | 6 +- .../src/counter.gen.tsx | 5 +- .../typescript-react-example/src/index.tsx | 2 +- .../src/location/location.gen.tsx | 4 +- .../src/nested/Tuples.gen.tsx | 9 +- .../src/nested/Types.gen.tsx | 30 +- .../src/strange_file_names/404.gen.tsx | 5 +- .../strange_file_names/AppModal.web.gen.tsx | 5 +- .../src/strange_file_names/_under.gen.tsx | 5 +- .../with_underscore.gen.tsx | 5 +- jscomp/test/variantsMatching.gen.tsx | 10 +- 74 files changed, 469 insertions(+), 582 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d437b811b5..087efa38cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,10 +12,6 @@ # 11.0.0-rc.5 (Unreleased) -#### :boom: Breaking Change - -- Gentype now emits comments to suppress warnings from [`@typescript-eslint/plugin`](https://typescript-eslint.io/) instead of TSLint. https://github.com/rescript-lang/rescript-compiler/pull/6442 - #### :bug: Bug Fix - Fix issue with dynamic import of module in nested expressions https://github.com/rescript-lang/rescript-compiler/pull/6431 @@ -26,6 +22,7 @@ #### :nail_care: Polish - Add [`Deno`](https://deno.land/api?s=Deno) to reserved names, so that modules named `Deno` don't clash with the globally exposed `Deno` object. https://github.com/rescript-lang/rescript-compiler/pull/6428 +- Disable ESLint/TSLint on gentype outputs properly. https://github.com/rescript-lang/rescript-compiler/pull/6442 # 11.0.0-rc.4 diff --git a/jscomp/gentype/EmitType.ml b/jscomp/gentype/EmitType.ml index 3deb3d2cf3..919398ce97 100644 --- a/jscomp/gentype/EmitType.ml +++ b/jscomp/gentype/EmitType.ml @@ -3,15 +3,15 @@ open GenTypeCommon let fileHeader ~sourceFile = let makeHeader ~lines = match lines with - | [line] -> "/* " ^ line ^ " */\n" + | [line] -> "/* " ^ line ^ " */\n\n" | _ -> "/** \n" ^ (lines |> List.map (fun line -> " * " ^ line) |> String.concat "\n") - ^ "\n */\n" + ^ "\n */\n\n" in makeHeader ~lines:["TypeScript file generated from " ^ sourceFile ^ " by genType."] - ^ "/* eslint-disable import/first */\n\n" + ^ "/* eslint-disable */\n" ^ "/* tslint:disable */\n" let interfaceName ~(config : Config.t) name = match config.exportInterfaces with @@ -354,18 +354,15 @@ let emitExportType ~(config : Config.t) ~emitters ~nameAs ~opaque ~type_ | true -> "any" | false -> typeVars |> String.concat " | " in - "// eslint-disable-next-line max-classes-per-file naming-convention\n" - ^ docString ^ "export abstract class " ^ resolvedTypeName ^ typeParamsString + docString ^ "export abstract class " ^ resolvedTypeName ^ typeParamsString ^ " { protected opaque!: " ^ typeOfOpaqueField ^ " }; /* simulate opaque types */" ^ exportNameAs |> Emitters.export ~emitters else - "// eslint-disable-next-line consistent-type-definitions\n" - ^ (if isInterface && config.exportInterfaces then - docString ^ "export interface " ^ resolvedTypeName ^ typeParamsString - ^ " " - else - docString ^ "export type " ^ resolvedTypeName ^ typeParamsString ^ " = ") + (if isInterface && config.exportInterfaces then + docString ^ "export interface " ^ resolvedTypeName ^ typeParamsString ^ " " + else + docString ^ "export type " ^ resolvedTypeName ^ typeParamsString ^ " = ") ^ (match type_ with | _ -> type_ |> typeToString ~config ~typeNameIsInterface) ^ ";" ^ exportNameAs @@ -383,13 +380,6 @@ let emitImportValueAsEarly ~emitters ~name ~nameAs importPath = let emitRequire ~importedValueOrComponent ~early ~emitters ~(config : Config.t) ~moduleName importPath = - let commentBeforeRequire = - match importedValueOrComponent with - | true -> "// eslint-disable-next-line @typescript-eslint/no-var-requires\n" - | false -> - "// eslint-disable-next-line @typescript-eslint/ban-ts-comment\n" - ^ "// @ts-ignore: Implicit any on import\n" - in let importPath = match config.moduleResolution with | Node -> @@ -401,7 +391,7 @@ let emitRequire ~importedValueOrComponent ~early ~emitters ~(config : Config.t) | ES6 when not importedValueOrComponent -> let moduleNameString = ModuleName.toString moduleName in (let es6ImportModule = moduleNameString ^ "__Es6Import" in - commentBeforeRequire ^ "import * as " ^ es6ImportModule ^ " from '" + "import * as " ^ es6ImportModule ^ " from '" ^ (importPath |> ImportPath.emit) ^ "';\n" ^ "const " ^ moduleNameString ^ ": any = " ^ es6ImportModule ^ ";") |> (match early with @@ -409,7 +399,7 @@ let emitRequire ~importedValueOrComponent ~early ~emitters ~(config : Config.t) | false -> Emitters.require) ~emitters | _ -> - commentBeforeRequire ^ "const " + "const " ^ ModuleName.toString moduleName ^ " = require('" ^ (importPath |> ImportPath.emit) diff --git a/jscomp/gentype_tests/typescript-react-example/package-lock.json b/jscomp/gentype_tests/typescript-react-example/package-lock.json index 241c4c3ae1..29b93c0ee4 100644 --- a/jscomp/gentype_tests/typescript-react-example/package-lock.json +++ b/jscomp/gentype_tests/typescript-react-example/package-lock.json @@ -24,16 +24,18 @@ }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", "dev": true, - "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.3.0" }, @@ -46,16 +48,18 @@ }, "node_modules/@eslint-community/regexpp": { "version": "4.9.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz", + "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==", "dev": true, - "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, - "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -76,16 +80,18 @@ }, "node_modules/@eslint/js": { "version": "8.51.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz", + "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==", "dev": true, - "license": "MIT", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.11", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", + "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", "debug": "^4.1.1", @@ -97,8 +103,9 @@ }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=12.22" }, @@ -109,13 +116,15 @@ }, "node_modules/@humanwhocodes/object-schema": { "version": "1.2.1", - "dev": true, - "license": "BSD-3-Clause" + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "dev": true }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, - "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -126,16 +135,18 @@ }, "node_modules/@nodelib/fs.stat": { "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true, - "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/@nodelib/fs.walk": { "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, - "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -146,7 +157,8 @@ }, "node_modules/@rescript/react": { "version": "0.11.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.11.0.tgz", + "integrity": "sha512-RzoAO+3cJwXE2D7yodMo4tBO2EkeDYCN/I/Sj/yRweI3S1CY1ZBOF/GMcVtjeIurJJt7KMveqQXTaRrqoGZBBg==", "peerDependencies": { "react": ">=18.0.0", "react-dom": ">=18.0.0" @@ -154,23 +166,27 @@ }, "node_modules/@types/json-schema": { "version": "7.0.14", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz", + "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==", + "dev": true }, "node_modules/@types/node": { - "version": "18.15.12", - "dev": true, - "license": "MIT" + "version": "18.18.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.6.tgz", + "integrity": "sha512-wf3Vz+jCmOQ2HV1YUJuCWdL64adYxumkrxtc+H1VUQlnQI04+5HtH+qZCOE21lBE7gIrt+CwX2Wv8Acrw5Ak6w==", + "dev": true }, "node_modules/@types/prop-types": { - "version": "15.7.5", - "dev": true, - "license": "MIT" + "version": "15.7.9", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.9.tgz", + "integrity": "sha512-n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g==", + "dev": true }, "node_modules/@types/react": { - "version": "16.14.30", + "version": "18.2.29", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.29.tgz", + "integrity": "sha512-Z+ZrIRocWtdD70j45izShRwDuiB4JZqDegqMFW/I8aG5DxxLKOzVNoq62UIO82v9bdgi+DO1jvsb9sTEZUSm+Q==", "dev": true, - "license": "MIT", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -178,27 +194,31 @@ } }, "node_modules/@types/react-dom": { - "version": "18.0.11", + "version": "18.2.14", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.14.tgz", + "integrity": "sha512-V835xgdSVmyQmI1KLV2BEIUgqEuinxp9O4G6g3FqO/SqLac049E53aysv0oEFD2kHfejeKU+ZqL2bcFWj9gLAQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/react": "*" } }, "node_modules/@types/scheduler": { - "version": "0.16.2", - "dev": true, - "license": "MIT" + "version": "0.16.5", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.5.tgz", + "integrity": "sha512-s/FPdYRmZR8SjLWGMCuax7r3qCWQw9QKHzXVukAuuIJkXkDRwp+Pu5LMIVFi0Fxbav35WURicYr8u1QsoybnQw==", + "dev": true }, "node_modules/@types/semver": { - "version": "7.5.3", - "dev": true, - "license": "MIT" + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==", + "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "6.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.8.0.tgz", + "integrity": "sha512-GosF4238Tkes2SHPQ1i8f6rMtG6zlKwMEB0abqSJ3Npvos+doIlc/ATG+vX1G9coDF3Ex78zM3heXHLyWEwLUw==", "dev": true, - "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.5.1", "@typescript-eslint/scope-manager": "6.8.0", @@ -231,8 +251,9 @@ }, "node_modules/@typescript-eslint/parser": { "version": "6.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.8.0.tgz", + "integrity": "sha512-5tNs6Bw0j6BdWuP8Fx+VH4G9fEPDxnVI7yH1IAPkQH5RUtvKwRoqdecAPdQXv4rSOADAaz1LFBZvZG7VbXivSg==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/scope-manager": "6.8.0", "@typescript-eslint/types": "6.8.0", @@ -258,8 +279,9 @@ }, "node_modules/@typescript-eslint/scope-manager": { "version": "6.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.8.0.tgz", + "integrity": "sha512-xe0HNBVwCph7rak+ZHcFD6A+q50SMsFwcmfdjs9Kz4qDh5hWhaPhFjRs/SODEhroBI5Ruyvyz9LfwUJ624O40g==", "dev": true, - "license": "MIT", "dependencies": { "@typescript-eslint/types": "6.8.0", "@typescript-eslint/visitor-keys": "6.8.0" @@ -274,8 +296,9 @@ }, "node_modules/@typescript-eslint/type-utils": { "version": "6.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.8.0.tgz", + "integrity": "sha512-RYOJdlkTJIXW7GSldUIHqc/Hkto8E+fZN96dMIFhuTJcQwdRoGN2rEWA8U6oXbLo0qufH7NPElUb+MceHtz54g==", "dev": true, - "license": "MIT", "dependencies": { "@typescript-eslint/typescript-estree": "6.8.0", "@typescript-eslint/utils": "6.8.0", @@ -300,8 +323,9 @@ }, "node_modules/@typescript-eslint/types": { "version": "6.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.8.0.tgz", + "integrity": "sha512-p5qOxSum7W3k+llc7owEStXlGmSl8FcGvhYt8Vjy7FqEnmkCVlM3P57XQEGj58oqaBWDQXbJDZxwUWMS/EAPNQ==", "dev": true, - "license": "MIT", "engines": { "node": "^16.0.0 || >=18.0.0" }, @@ -312,8 +336,9 @@ }, "node_modules/@typescript-eslint/typescript-estree": { "version": "6.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.8.0.tgz", + "integrity": "sha512-ISgV0lQ8XgW+mvv5My/+iTUdRmGspducmQcDw5JxznasXNnZn3SKNrTRuMsEXv+V/O+Lw9AGcQCfVaOPCAk/Zg==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/types": "6.8.0", "@typescript-eslint/visitor-keys": "6.8.0", @@ -338,8 +363,9 @@ }, "node_modules/@typescript-eslint/utils": { "version": "6.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.8.0.tgz", + "integrity": "sha512-dKs1itdE2qFG4jr0dlYLQVppqTE+Itt7GmIf/vX6CSvsW+3ov8PbWauVKyyfNngokhIO9sKZeRGCUo1+N7U98Q==", "dev": true, - "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", @@ -362,8 +388,9 @@ }, "node_modules/@typescript-eslint/visitor-keys": { "version": "6.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.8.0.tgz", + "integrity": "sha512-oqAnbA7c+pgOhW2OhGvxm0t1BULX5peQI/rLsNDpGM78EebV3C9IGbX5HNZabuZ6UQrYveCLjKo8Iy/lLlBkkg==", "dev": true, - "license": "MIT", "dependencies": { "@typescript-eslint/types": "6.8.0", "eslint-visitor-keys": "^3.4.1" @@ -378,8 +405,9 @@ }, "node_modules/acorn": { "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true, - "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -389,16 +417,18 @@ }, "node_modules/acorn-jsx": { "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, - "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "node_modules/ajv": { "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, - "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -412,16 +442,18 @@ }, "node_modules/ansi-regex": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/ansi-styles": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -434,26 +466,30 @@ }, "node_modules/argparse": { "version": "2.0.1", - "dev": true, - "license": "Python-2.0" + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/array-union": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/balanced-match": { "version": "1.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true }, "node_modules/brace-expansion": { "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -461,8 +497,9 @@ }, "node_modules/braces": { "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, - "license": "MIT", "dependencies": { "fill-range": "^7.0.1" }, @@ -472,16 +509,18 @@ }, "node_modules/callsites": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/chalk": { "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -495,8 +534,9 @@ }, "node_modules/color-convert": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -506,18 +546,21 @@ }, "node_modules/color-name": { "version": "1.1.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "node_modules/concat-map": { "version": "0.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true }, "node_modules/cross-spawn": { "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, - "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -528,14 +571,16 @@ } }, "node_modules/csstype": { - "version": "3.1.0", - "dev": true, - "license": "MIT" + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", + "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==", + "dev": true }, "node_modules/debug": { "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, - "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -550,13 +595,15 @@ }, "node_modules/deep-is": { "version": "0.1.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true }, "node_modules/dir-glob": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, - "license": "MIT", "dependencies": { "path-type": "^4.0.0" }, @@ -566,8 +613,9 @@ }, "node_modules/doctrine": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, - "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -577,8 +625,9 @@ }, "node_modules/escape-string-regexp": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -588,8 +637,9 @@ }, "node_modules/eslint": { "version": "8.51.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz", + "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==", "dev": true, - "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -641,8 +691,9 @@ }, "node_modules/eslint-scope": { "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -656,8 +707,9 @@ }, "node_modules/eslint-visitor-keys": { "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, - "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -667,8 +719,9 @@ }, "node_modules/espree": { "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -683,8 +736,9 @@ }, "node_modules/esquery": { "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" }, @@ -694,8 +748,9 @@ }, "node_modules/esrecurse": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -705,29 +760,33 @@ }, "node_modules/estraverse": { "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } }, "node_modules/esutils": { "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/fast-deep-equal": { "version": "3.1.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, "node_modules/fast-glob": { "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", "dev": true, - "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -741,8 +800,9 @@ }, "node_modules/fast-glob/node_modules/glob-parent": { "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, - "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -752,26 +812,30 @@ }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "node_modules/fast-levenshtein": { "version": "2.0.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true }, "node_modules/fastq": { "version": "1.15.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", + "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", "dev": true, - "license": "ISC", "dependencies": { "reusify": "^1.0.4" } }, "node_modules/file-entry-cache": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", "dev": true, - "license": "MIT", "dependencies": { "flat-cache": "^3.0.4" }, @@ -781,8 +845,9 @@ }, "node_modules/fill-range": { "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, - "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -792,8 +857,9 @@ }, "node_modules/find-up": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, - "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -807,8 +873,9 @@ }, "node_modules/flat-cache": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", + "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", "dev": true, - "license": "MIT", "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -820,18 +887,21 @@ }, "node_modules/flatted": { "version": "3.2.9", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "dev": true }, "node_modules/fs.realpath": { "version": "1.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true }, "node_modules/glob": { "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, - "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -849,8 +919,9 @@ }, "node_modules/glob-parent": { "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, - "license": "ISC", "dependencies": { "is-glob": "^4.0.3" }, @@ -860,8 +931,9 @@ }, "node_modules/globals": { "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, - "license": "MIT", "dependencies": { "type-fest": "^0.20.2" }, @@ -874,8 +946,9 @@ }, "node_modules/globby": { "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, - "license": "MIT", "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", @@ -893,29 +966,33 @@ }, "node_modules/graphemer": { "version": "1.4.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true }, "node_modules/has-flag": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/ignore": { "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", "dev": true, - "license": "MIT", "engines": { "node": ">= 4" } }, "node_modules/import-fresh": { "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, - "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -929,16 +1006,18 @@ }, "node_modules/imurmurhash": { "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8.19" } }, "node_modules/inflight": { "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "dev": true, - "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -946,21 +1025,24 @@ }, "node_modules/inherits": { "version": "2.0.4", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true }, "node_modules/is-extglob": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/is-glob": { "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, - "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -970,33 +1052,38 @@ }, "node_modules/is-number": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.12.0" } }, "node_modules/is-path-inside": { "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/isexe": { "version": "2.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true }, "node_modules/js-tokens": { "version": "4.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/js-yaml": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -1006,31 +1093,36 @@ }, "node_modules/json-buffer": { "version": "3.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true }, "node_modules/keyv": { "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, - "license": "MIT", "dependencies": { "json-buffer": "3.0.1" } }, "node_modules/levn": { "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, - "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -1041,8 +1133,9 @@ }, "node_modules/locate-path": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, - "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -1055,12 +1148,14 @@ }, "node_modules/lodash.merge": { "version": "4.6.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true }, "node_modules/loose-envify": { "version": "1.4.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, @@ -1070,8 +1165,9 @@ }, "node_modules/lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -1081,16 +1177,18 @@ }, "node_modules/merge2": { "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/micromatch": { "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "dev": true, - "license": "MIT", "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -1101,8 +1199,9 @@ }, "node_modules/minimatch": { "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, - "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -1112,26 +1211,30 @@ }, "node_modules/ms": { "version": "2.1.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true }, "node_modules/natural-compare": { "version": "1.4.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true }, "node_modules/once": { "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, - "license": "ISC", "dependencies": { "wrappy": "1" } }, "node_modules/optionator": { "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, - "license": "MIT", "dependencies": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -1146,8 +1249,9 @@ }, "node_modules/p-limit": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, - "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -1160,8 +1264,9 @@ }, "node_modules/p-locate": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, - "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -1174,8 +1279,9 @@ }, "node_modules/parent-module": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, - "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -1185,40 +1291,45 @@ }, "node_modules/path-exists": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/path-is-absolute": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/path-key": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/path-type": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/picomatch": { "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8.6" }, @@ -1228,22 +1339,26 @@ }, "node_modules/prelude-ls": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8.0" } }, "node_modules/punycode": { "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/queue-microtask": { "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true, "funding": [ { @@ -1258,12 +1373,12 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" + ] }, "node_modules/react": { "version": "18.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", + "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", "dependencies": { "loose-envify": "^1.1.0" }, @@ -1273,7 +1388,8 @@ }, "node_modules/react-dom": { "version": "18.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", + "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" @@ -1283,7 +1399,8 @@ } }, "node_modules/rescript": { - "version": "11.0.0-rc.4", + "version": "11.0.0-rc.5", + "resolved": "file:../../..", "dev": true, "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", @@ -1298,16 +1415,18 @@ }, "node_modules/resolve-from": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/reusify": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true, - "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -1315,8 +1434,9 @@ }, "node_modules/rimraf": { "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, - "license": "ISC", "dependencies": { "glob": "^7.1.3" }, @@ -1329,6 +1449,8 @@ }, "node_modules/run-parallel": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "dev": true, "funding": [ { @@ -1344,22 +1466,23 @@ "url": "https://feross.org/support" } ], - "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } }, "node_modules/scheduler": { "version": "0.23.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", + "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", "dependencies": { "loose-envify": "^1.1.0" } }, "node_modules/semver": { "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, - "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -1372,8 +1495,9 @@ }, "node_modules/shebang-command": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, - "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -1383,24 +1507,27 @@ }, "node_modules/shebang-regex": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/slash": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/strip-ansi": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, - "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -1410,8 +1537,9 @@ }, "node_modules/strip-json-comments": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" }, @@ -1421,8 +1549,9 @@ }, "node_modules/supports-color": { "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -1432,13 +1561,15 @@ }, "node_modules/text-table": { "version": "0.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true }, "node_modules/to-regex-range": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, - "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -1448,8 +1579,9 @@ }, "node_modules/ts-api-utils": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz", + "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==", "dev": true, - "license": "MIT", "engines": { "node": ">=16.13.0" }, @@ -1459,8 +1591,9 @@ }, "node_modules/type-check": { "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, - "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" }, @@ -1470,8 +1603,9 @@ }, "node_modules/type-fest": { "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, - "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -1481,8 +1615,9 @@ }, "node_modules/typescript": { "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, - "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -1493,16 +1628,18 @@ }, "node_modules/uri-js": { "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } }, "node_modules/which": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, - "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -1515,18 +1652,21 @@ }, "node_modules/wrappy": { "version": "1.0.2", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true }, "node_modules/yallist": { "version": "4.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "node_modules/yocto-queue": { "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, diff --git a/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.gen.tsx index 6766997986..55660702c9 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.gen.tsx @@ -1,23 +1,18 @@ /* TypeScript file generated from AutoAnnotate.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line consistent-type-definitions export type variant = { TAG: "R"; _0: number }; -// eslint-disable-next-line consistent-type-definitions export type record = { readonly variant: variant }; -// eslint-disable-next-line consistent-type-definitions export type r2 = { readonly r2: number }; -// eslint-disable-next-line consistent-type-definitions export type r3 = { readonly r3: number }; -// eslint-disable-next-line consistent-type-definitions export type r4 = { readonly r4: number }; -// eslint-disable-next-line consistent-type-definitions export type annotatedVariant = { TAG: "R2"; _0: r2; _1: r3 } | { TAG: "R4"; _0: r4 }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.gen.tsx index 3d7187089e..3a734499c9 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.gen.tsx @@ -1,8 +1,8 @@ /* TypeScript file generated from BucklescriptAnnotations.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line consistent-type-definitions export type someMutableFields = { mutable0: string; readonly immutable: number; @@ -10,7 +10,6 @@ export type someMutableFields = { mutable2: string }; -// eslint-disable-next-line consistent-type-definitions export type someMethods = { readonly send: (_1:string) => void; readonly on: (_1:string, _2:((_1:number) => void)) => void; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx index 131fbedf00..d1291b9059 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx @@ -1,22 +1,18 @@ /* TypeScript file generated from Comments.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as CommentsBS__Es6Import from './Comments.bs'; const CommentsBS: any = CommentsBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type DecideSubject_payload = { /** A hint to use as a guide when thinking of your poem. */ readonly hint: string }; -// eslint-disable-next-line max-classes-per-file naming-convention /** The input used to generate the prompt and system prompt. */ export abstract class DecideSubject_input { protected opaque!: any }; /* simulate opaque types */ -// eslint-disable-next-line consistent-type-definitions /** The output from evaluating the llm prompt */ export type DecideSubject_output = { /** The text of the poem. */ diff --git a/jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx index 705031e310..c90f845827 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx @@ -1,6 +1,7 @@ /* TypeScript file generated from Core.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ import {someFunWithNullThenOptionalArgs as someFunWithNullThenOptionalArgsNotChecked} from './CoreTS'; @@ -18,16 +19,12 @@ export const someFunWithNullUndefinedArgTypeChecked: (_1:(null | undefined | str // Export 'someFunWithNullUndefinedArg' early to allow circular import from the '.bs.js' file. export const someFunWithNullUndefinedArg: unknown = someFunWithNullUndefinedArgTypeChecked as (_1:(null | undefined | string), _2:number) => string; -// eslint-disable-next-line @typescript-eslint/no-var-requires const CoreBS = require('./Core.bs'); -// eslint-disable-next-line consistent-type-definitions export type variant = "A" | { TAG: "B"; _0: string }; -// eslint-disable-next-line consistent-type-definitions export type t1 = { readonly x?: string }; -// eslint-disable-next-line consistent-type-definitions export type t2 = { readonly x: (undefined | string) }; export const null0: (x:(null | number)) => (null | number) = CoreBS.null0; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx index 1e8b4f72b0..3385aed5d6 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx @@ -1,13 +1,11 @@ /* TypeScript file generated from Docstrings.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as DocstringsBS__Es6Import from './Docstrings.bs'; const DocstringsBS: any = DocstringsBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type t = "A" | "B"; /** hello */ diff --git a/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.gen.tsx index b4b1df32d5..3546cc60e0 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.gen.tsx @@ -1,13 +1,11 @@ /* TypeScript file generated from EmitModuleIfNoConversion.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as EmitModuleIfNoConversionBS__Es6Import from './EmitModuleIfNoConversion.bs'; const EmitModuleIfNoConversionBS: any = EmitModuleIfNoConversionBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type t = "A" | { TAG: "B"; readonly name: string }; export const X_foo: (t:t) => void = EmitModuleIfNoConversionBS.X.foo; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx index 05815976bc..9b5bc42b59 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx @@ -1,15 +1,13 @@ /* TypeScript file generated from ExportWithRename.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ import * as React from 'react'; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as ExportWithRenameBS__Es6Import from './ExportWithRename.bs'; const ExportWithRenameBS: any = ExportWithRenameBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type Props = { readonly s: string }; export const make: React.ComponentType<{ readonly s: string }> = ExportWithRenameBS.ExportWithRename; diff --git a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.gen.tsx index 7d4d4af27d..e74bca9e88 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.gen.tsx @@ -1,19 +1,15 @@ /* TypeScript file generated from FirstClassModules.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as FirstClassModulesBS__Es6Import from './FirstClassModules.bs'; const FirstClassModulesBS: any = FirstClassModulesBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type MT_t = number; -// eslint-disable-next-line consistent-type-definitions export type MT_InnerModule3_inner = number; -// eslint-disable-next-line consistent-type-definitions export type firstClassModule = { readonly x: number; readonly EmptyInnerModule: { diff --git a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.gen.tsx index bb9b564334..6812f915cf 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.gen.tsx @@ -1,16 +1,13 @@ /* TypeScript file generated from FirstClassModulesInterface.resi by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as FirstClassModulesInterfaceBS__Es6Import from './FirstClassModulesInterface.bs'; const FirstClassModulesInterfaceBS: any = FirstClassModulesInterfaceBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type record = { readonly x: number; readonly y: string }; -// eslint-disable-next-line consistent-type-definitions export type firstClassModule = { readonly x: number }; export const MT_x: number = FirstClassModulesInterfaceBS.MT.x; diff --git a/jscomp/gentype_tests/typescript-react-example/src/GADT.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/GADT.gen.tsx index 734d53f1db..b6e29a5c55 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/GADT.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/GADT.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from GADT.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line max-classes-per-file naming-convention export abstract class t { protected opaque!: any }; /* simulate opaque types */ -// eslint-disable-next-line max-classes-per-file naming-convention export abstract class tt { protected opaque!: any }; /* simulate opaque types */ diff --git a/jscomp/gentype_tests/typescript-react-example/src/Hooks.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Hooks.gen.tsx index 392879882c..48c26b8da9 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Hooks.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Hooks.gen.tsx @@ -1,80 +1,63 @@ /* TypeScript file generated from Hooks.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ import * as React from 'react'; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as HooksBS__Es6Import from './Hooks.bs'; const HooksBS: any = HooksBS__Es6Import; import type {TypedArray2_Uint8Array_t as Js_TypedArray2_Uint8Array_t} from '../src/shims/Js.shim'; -// eslint-disable-next-line consistent-type-definitions export type vehicle = { readonly name: string }; -// eslint-disable-next-line consistent-type-definitions export type cb = (_to:vehicle) => void; -// eslint-disable-next-line consistent-type-definitions export type r = { readonly x: string }; -// eslint-disable-next-line consistent-type-definitions export type callback = (_1:input) => output; -// eslint-disable-next-line consistent-type-definitions export type testReactContext = React.Context; -// eslint-disable-next-line consistent-type-definitions export type testReactRef = { current: (null | number) }; -// eslint-disable-next-line consistent-type-definitions export type testDomRef = React.Ref; -// eslint-disable-next-line consistent-type-definitions export type testDomRef2 = React.Ref; -// eslint-disable-next-line consistent-type-definitions export type Props = { readonly vehicle: vehicle }; export const $$default: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.default; export default $$default; -// eslint-disable-next-line consistent-type-definitions export type Another_anotherComponent_Props = { readonly callback: () => void; readonly vehicle: vehicle }; export const Another_anotherComponent: React.ComponentType<{ readonly callback: () => void; readonly vehicle: vehicle }> = HooksBS.Another.anotherComponent; -// eslint-disable-next-line consistent-type-definitions export type Inner_make_Props = { readonly vehicle: vehicle }; export const Inner_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.Inner.make; -// eslint-disable-next-line consistent-type-definitions export type Inner_Another_anotherComponent_Props = { readonly vehicle: vehicle }; export const Inner_Another_anotherComponent: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.Inner.Another.anotherComponent; -// eslint-disable-next-line consistent-type-definitions export type Inner_Inner2_make_Props = { readonly vehicle: vehicle }; export const Inner_Inner2_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.Inner.Inner2.make; -// eslint-disable-next-line consistent-type-definitions export type Inner_Inner2_Another_anotherComponent_Props = { readonly vehicle: vehicle }; export const Inner_Inner2_Another_anotherComponent: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.Inner.Inner2.Another.anotherComponent; -// eslint-disable-next-line consistent-type-definitions export type NoProps_make_Props = {}; export const NoProps_make: React.ComponentType<{}> = HooksBS.NoProps.make; export const functionWithRenamedArgs: (_to:vehicle, _Type:vehicle, cb:cb) => string = HooksBS.functionWithRenamedArgs; -// eslint-disable-next-line consistent-type-definitions export type WithRename_componentWithRenamedArgs_Props = { readonly _Type: vehicle; readonly _to: vehicle; @@ -89,37 +72,30 @@ export const WithRename_componentWithRenamedArgs: React.ComponentType<{ export const WithRef_makeWithRef: (_1:{ readonly vehicle: vehicle }, _2:(null | undefined | any)) => JSX.Element = HooksBS.WithRef.makeWithRef; -// eslint-disable-next-line consistent-type-definitions export type testForwardRef_Props = { readonly vehicle: vehicle }; export const testForwardRef: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.testForwardRef; -// eslint-disable-next-line consistent-type-definitions export type ForwardRef_input_Props = { readonly r: r }; export const ForwardRef_input: React.ComponentType<{ readonly r: r }> = HooksBS.ForwardRef.input; -// eslint-disable-next-line consistent-type-definitions export type Poly_polymorphicComponent_Props = { readonly p: [vehicle, T1] }; export const Poly_polymorphicComponent: React.ComponentType<{ readonly p: [vehicle, any] }> = HooksBS.Poly.polymorphicComponent; -// eslint-disable-next-line consistent-type-definitions export type Fun_functionReturningReactElement_Props = { readonly name: string }; export const Fun_functionReturningReactElement: React.ComponentType<{ readonly name: string }> = HooksBS.Fun.functionReturningReactElement; -// eslint-disable-next-line consistent-type-definitions export type RenderPropRequiresConversion_make_Props = { readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> }; export const RenderPropRequiresConversion_make: React.ComponentType<{ readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> }> = HooksBS.RenderPropRequiresConversion.make; -// eslint-disable-next-line consistent-type-definitions export type WithChildren_aComponentWithChildren_Props = { readonly children: React.ReactNode; readonly vehicle: vehicle }; export const WithChildren_aComponentWithChildren: React.ComponentType<{ readonly children: React.ReactNode; readonly vehicle: vehicle }> = HooksBS.WithChildren.aComponentWithChildren; -// eslint-disable-next-line consistent-type-definitions export type DD_make_Props = { readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string }; export const DD_make: React.ComponentType<{ readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string }> = HooksBS.DD.make; diff --git a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.gen.tsx index 07d3ce1553..e1da44fd51 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.gen.tsx @@ -1,6 +1,6 @@ /* TypeScript file generated from IgnoreInterface.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line consistent-type-definitions export type t = number; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.gen.tsx index 72b333906f..abe6a7218d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.gen.tsx @@ -1,6 +1,7 @@ /* TypeScript file generated from ImportHookDefault.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ import {default as makeNotChecked} from './hookExample'; @@ -36,7 +37,6 @@ export const $$default: unknown = defaultTypeChecked as React.ComponentType<{ import type {renderMe as ImportHooks_renderMe} from './ImportHooks.gen'; -// eslint-disable-next-line consistent-type-definitions export type person = { readonly name: string; readonly age: number }; export default $$default; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.gen.tsx index aa4de6f14a..6324c0c90e 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.gen.tsx @@ -1,6 +1,7 @@ /* TypeScript file generated from ImportHooks.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ import {makeRenamed as makeRenamedNotChecked} from './hookExample'; @@ -28,8 +29,6 @@ export const fooTypeChecked: (person:person) => string = fooNotChecked; // Export 'foo' early to allow circular import from the '.bs.js' file. export const foo: unknown = fooTypeChecked as (person:person) => string; -// eslint-disable-next-line consistent-type-definitions export type person = { readonly name: string; readonly age: number }; -// eslint-disable-next-line consistent-type-definitions export type renderMe = React.ComponentType<{ readonly randomString: string; readonly poly: a }>; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.gen.tsx index be5656abba..b5a81b2697 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.gen.tsx @@ -1,6 +1,7 @@ /* TypeScript file generated from ImportIndex.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ import {default as defaultNotChecked} from './'; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx index b8a53b250c..a68ca98915 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx @@ -1,6 +1,7 @@ /* TypeScript file generated from ImportJsValue.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ import {round as roundNotChecked} from './MyMath'; @@ -74,7 +75,6 @@ export const defaultTypeChecked: number = defaultNotChecked; // Export '$$default' early to allow circular import from the '.bs.js' file. export const $$default: unknown = defaultTypeChecked as number; -// eslint-disable-next-line @typescript-eslint/no-var-requires const ImportJsValueBS = require('./ImportJsValue.bs'); import type {AbsoluteValue as $$AbsoluteValue_t} from './MyMath'; @@ -89,33 +89,24 @@ import type {polyType as $$polyType} from './MyMath'; import type {stringFunction as $$stringFunction} from './MyMath'; -// eslint-disable-next-line consistent-type-definitions export type point = { readonly x: number; readonly y: (undefined | number) }; -// eslint-disable-next-line consistent-type-definitions export type numberOrString = $$numberOrString; -// eslint-disable-next-line consistent-type-definitions export type AbsoluteValue_t = $$AbsoluteValue_t; -// eslint-disable-next-line consistent-type-definitions export type stringFunction = $$stringFunction; -// eslint-disable-next-line consistent-type-definitions export type color = "tomato" | "gray"; -// eslint-disable-next-line consistent-type-definitions export type variant = { TAG: "I"; _0: number } | { TAG: "S"; _0: string }; -// eslint-disable-next-line consistent-type-definitions export type num = $$num; -// eslint-disable-next-line consistent-type-definitions export type myNum = $$myNum; -// eslint-disable-next-line consistent-type-definitions export type polyType = $$polyType; export const roundedNumber: number = ImportJsValueBS.roundedNumber; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Inherits.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Inherits.gen.tsx index b7cda46b7e..29faeb762f 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Inherits.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Inherits.gen.tsx @@ -1,12 +1,10 @@ /* TypeScript file generated from Inherits.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line consistent-type-definitions export type red = "Ruby" | "Redwood" | "Rust"; -// eslint-disable-next-line consistent-type-definitions export type blue = "Sapphire" | "Neon" | "Navy"; -// eslint-disable-next-line consistent-type-definitions export type color = red | blue; diff --git a/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.gen.tsx index ef055ad392..033c413677 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.gen.tsx @@ -1,13 +1,11 @@ /* TypeScript file generated from InnerModuleSignature.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as InnerModuleSignatureBS__Es6Import from './InnerModuleSignature.bs'; const InnerModuleSignatureBS: any = InnerModuleSignatureBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type InnerModule_t = string; export const InnerModule_make: (_1:InnerModule_t) => string = InnerModuleSignatureBS.InnerModule.make; diff --git a/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx index e80374da73..c27b805103 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx @@ -1,6 +1,7 @@ /* TypeScript file generated from JSXV4.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ import {make as makeNotChecked} from './hookExample'; @@ -22,19 +23,14 @@ export const make: unknown = makeTypeChecked as React.ComponentType<{ readonly renderMe: renderMe }>; -// eslint-disable-next-line @typescript-eslint/no-var-requires const JSXV4BS = require('./JSXV4.bs'); -// eslint-disable-next-line consistent-type-definitions export type CompV4_props = { readonly x: x; readonly y: y }; -// eslint-disable-next-line consistent-type-definitions export type person = { readonly name: string; readonly age: number }; -// eslint-disable-next-line consistent-type-definitions export type renderMe = React.ComponentType<{ readonly randomString: string; readonly poly: a }>; -// eslint-disable-next-line consistent-type-definitions export type props = { readonly actions?: actions; readonly person: person; @@ -44,7 +40,6 @@ export type props = { export const CompV4_make: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4BS.CompV4.make; -// eslint-disable-next-line consistent-type-definitions export type Props = { readonly x: string; readonly y: string }; export const CompV3_make: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4BS.CompV3.make; diff --git a/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.gen.tsx index 9c1b11bb5b..008d238992 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from LabeledFun.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as LabeledFunBS__Es6Import from './LabeledFun.bs'; const LabeledFunBS: any = LabeledFunBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.gen.tsx index 8463820736..3a3852bbbd 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from LetPrivate.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as LetPrivateBS__Es6Import from './LetPrivate.bs'; const LetPrivateBS: any = LetPrivateBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Lib.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Lib.gen.tsx index 6e686fb3fa..83b8e67073 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Lib.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Lib.gen.tsx @@ -1,8 +1,8 @@ /* TypeScript file generated from Lib.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// tslint:disable-next-line:interface-over-type-literal export type action = { action: "A"; _0: string } | { action: "B"; _0: string }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Machine.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Machine.gen.tsx index cbd79c92f5..b4d482558c 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Machine.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Machine.gen.tsx @@ -1,13 +1,11 @@ /* TypeScript file generated from Machine.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as MachineBS__Es6Import from './Machine.bs'; const MachineBS: any = MachineBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type aa = { TAG: "A"; _0: number }; export const a: aa = MachineBS.a; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.gen.tsx index 4cc6932c54..6bd7e2836a 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.gen.tsx @@ -1,31 +1,23 @@ /* TypeScript file generated from ModuleAliases.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as ModuleAliasesBS__Es6Import from './ModuleAliases.bs'; const ModuleAliasesBS: any = ModuleAliasesBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type Outer_Inner_innerT = { readonly inner: string }; -// eslint-disable-next-line consistent-type-definitions export type Outer2_Inner2_InnerNested_t = { readonly nested: number }; -// eslint-disable-next-line consistent-type-definitions export type Outer2_OuterInnerAlias_innerT = Outer_Inner_innerT; -// eslint-disable-next-line consistent-type-definitions export type Outer2_Inner2_OuterInnerAlias2_innerT = Outer2_OuterInnerAlias_innerT; -// eslint-disable-next-line consistent-type-definitions export type Outer2Alias_OuterInnerAlias_innerT = Outer2_OuterInnerAlias_innerT; -// eslint-disable-next-line consistent-type-definitions export type Outer2Alias_Inner2_OuterInnerAlias2_innerT = Outer2_Inner2_OuterInnerAlias2_innerT; -// eslint-disable-next-line consistent-type-definitions export type InnerNestedAlias_t = Outer2_Inner2_InnerNested_t; export const testNested: (x:InnerNestedAlias_t) => InnerNestedAlias_t = ModuleAliasesBS.testNested; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.gen.tsx index d11a2a7b88..e5cf11bca5 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.gen.tsx @@ -1,21 +1,16 @@ /* TypeScript file generated from ModuleAliases2.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line consistent-type-definitions export type record = { readonly x: number; readonly y: string }; -// eslint-disable-next-line consistent-type-definitions export type Outer_outer = { readonly outer: string }; -// eslint-disable-next-line consistent-type-definitions export type Outer_Inner_inner = { readonly inner: string }; -// eslint-disable-next-line consistent-type-definitions export type OuterAlias_outer = Outer_outer; -// eslint-disable-next-line consistent-type-definitions export type OuterAlias_Inner_inner = Outer_Inner_inner; -// eslint-disable-next-line consistent-type-definitions export type InnerAlias_inner = OuterAlias_Inner_inner; diff --git a/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.gen.tsx index fb2f84fe3c..3c80d4c97f 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.gen.tsx @@ -1,16 +1,13 @@ /* TypeScript file generated from MoreVariants.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as MoreVariantsBS__Es6Import from './MoreVariants.bs'; const MoreVariantsBS: any = MoreVariantsBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type withRenaming = "type_" | "b"; -// eslint-disable-next-line consistent-type-definitions export type withoutRenaming = "type_" | "b"; export const testWithRenaming: (x:withRenaming) => withRenaming = MoreVariantsBS.testWithRenaming; diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyInput.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/MyInput.gen.tsx index 3322d2d25a..d9525c496a 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/MyInput.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/MyInput.gen.tsx @@ -1,6 +1,7 @@ /* TypeScript file generated from MyInput.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ import {default as defaultNotChecked} from './MyInput'; @@ -12,7 +13,6 @@ export const $$default: unknown = defaultTypeChecked as React.ComponentType<{ re import type {inputFocusEvent as $$inputFocusEvent} from './shims/ReactEvent.shim'; -// eslint-disable-next-line consistent-type-definitions export type inputFocusEvent = $$inputFocusEvent; export default $$default; diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyMath.ts b/jscomp/gentype_tests/typescript-react-example/src/MyMath.ts index dc485d33a2..55ea301c30 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/MyMath.ts +++ b/jscomp/gentype_tests/typescript-react-example/src/MyMath.ts @@ -26,6 +26,7 @@ export class AbsoluteValue { export type stringFunction = (_: string) => string; +// eslint-disable-next-line @typescript-eslint/no-unused-vars export const useColor = function(x: "tomato" | "gray"): number { return 0; }; @@ -33,6 +34,7 @@ export const useColor = function(x: "tomato" | "gray"): number { export const higherOrder = (foo: (_1: number, _2: number) => number) => foo(3, 4); +// eslint-disable-next-line @typescript-eslint/no-explicit-any export const convertVariant = (x: any) => x; export const polymorphic = (x: T): T => x; diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyModule.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/MyModule.gen.tsx index 8a20bc23a9..9db1f98ce3 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/MyModule.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/MyModule.gen.tsx @@ -1,13 +1,11 @@ /* TypeScript file generated from MyModule.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as MyModuleBS__Es6Import from './MyModule.bs'; const MyModuleBS: any = MyModuleBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type t = number; export const add: (a:t, b:t) => t = MyModuleBS.add; diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedModules.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NestedModules.gen.tsx index f8945fdd6d..d972a90f56 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/NestedModules.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/NestedModules.gen.tsx @@ -1,22 +1,17 @@ /* TypeScript file generated from NestedModules.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as NestedModulesBS__Es6Import from './NestedModules.bs'; const NestedModulesBS: any = NestedModulesBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type Universe_nestedType = string[]; -// eslint-disable-next-line consistent-type-definitions export type Universe_Nested2_nested2Type = Array; -// eslint-disable-next-line consistent-type-definitions export type Universe_Nested2_Nested3_nested3Type = Array>; -// eslint-disable-next-line consistent-type-definitions export type Universe_variant = "A" | { TAG: "B"; _0: string }; export const notNested: number = NestedModulesBS.notNested; diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.gen.tsx index 3d2ef4147e..126f383634 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from NestedModulesInSignature.resi by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as NestedModulesInSignatureBS__Es6Import from './NestedModulesInSignature.bs'; const NestedModulesInSignatureBS: any = NestedModulesInSignatureBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.gen.tsx index c84e202c67..2120f27c49 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.gen.tsx @@ -1,58 +1,44 @@ /* TypeScript file generated from NestedVariants.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as NestedVariantsBS__Es6Import from './NestedVariants.bs'; const NestedVariantsBS: any = NestedVariantsBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type typeL = { TAG: "NonUnary"; _0: number; _1: number }; -// eslint-disable-next-line consistent-type-definitions export type typeC = { TAG: "C"; _0: string } | { TAG: "D"; _0: string }; -// eslint-disable-next-line consistent-type-definitions export type typeB = { readonly c: typeC }; -// eslint-disable-next-line consistent-type-definitions export type typeD = { TAG: "Int"; _0: number }; -// eslint-disable-next-line consistent-type-definitions export type typeE = number; -// eslint-disable-next-line consistent-type-definitions export type typeA = { TAG: "A"; _0: a; _1: number } | { TAG: "B"; _0: a; _1: number }; -// eslint-disable-next-line consistent-type-definitions export type typeF = { TAG: "F"; _0: a } | { TAG: "G"; _0: a }; -// eslint-disable-next-line consistent-type-definitions export type typeH = { TAG: "H"; _0: typeD; _1: number } | { TAG: "I"; _0: typeD; _1: number }; -// eslint-disable-next-line consistent-type-definitions export type typeJ = { TAG: "J"; _0: typeD; _1: typeD }; -// eslint-disable-next-line consistent-type-definitions export type typeK = { TAG: "K"; _0: typeD; _1: typeD }; -// eslint-disable-next-line consistent-type-definitions export type boxedBinary = { TAG: "BB"; _0: typeD; _1: number } | { TAG: "Z"; _0: number }; -// eslint-disable-next-line consistent-type-definitions export type unboxedBinary = { TAG: "UB"; _0: typeD; _1: number }; -// eslint-disable-next-line consistent-type-definitions export type inline = { TAG: "I"; readonly i: number; readonly j: number } | { TAG: "J"; readonly i: number; readonly j: number } diff --git a/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.gen.tsx index 0a47e8a3fe..51366a0640 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.gen.tsx @@ -1,12 +1,10 @@ /* TypeScript file generated from NonrecursiveTypes.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line consistent-type-definitions export type notRecursive = number; -// eslint-disable-next-line consistent-type-definitions export type M_notRecursive = notRecursive[]; -// eslint-disable-next-line consistent-type-definitions export type M_recursive = { readonly self: M_recursive }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.gen.tsx index fdc8736765..aa422e0c12 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.gen.tsx @@ -1,6 +1,6 @@ /* TypeScript file generated from NumericPolyVar.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line consistent-type-definitions export type t = 12 | 0 | "b"; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Object.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Object.gen.tsx index 540beea977..c8e3a51522 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Object.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Object.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from Object.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line consistent-type-definitions export type someType = { readonly crop?: string; readonly "fp-z"?: string }; -// eslint-disable-next-line consistent-type-definitions export type someType2 = { readonly crop: (undefined | string); readonly "fp-z": (undefined | string) }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/OnClick2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/OnClick2.gen.tsx index fba707dabd..2feef1ec34 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/OnClick2.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/OnClick2.gen.tsx @@ -1,15 +1,13 @@ /* TypeScript file generated from OnClick2.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ import * as React from 'react'; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as OnClick2BS__Es6Import from './OnClick2.bs'; const OnClick2BS: any = OnClick2BS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type Props = { readonly onClick: (_1:MouseEvent) => void }; export const make: React.ComponentType<{ readonly onClick: (_1:MouseEvent) => void }> = OnClick2BS.make; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Opaque.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Opaque.gen.tsx index d2d257e9b9..53c4dd2e05 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Opaque.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Opaque.gen.tsx @@ -1,18 +1,15 @@ /* TypeScript file generated from Opaque.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as OpaqueBS__Es6Import from './Opaque.bs'; const OpaqueBS: any = OpaqueBS__Es6Import; import type {business as Records_business} from './Records.gen'; -// eslint-disable-next-line max-classes-per-file naming-convention export abstract class opaqueFromRecords { protected opaque!: any }; /* simulate opaque types */ -// eslint-disable-next-line consistent-type-definitions export type pair = [opaqueFromRecords, opaqueFromRecords]; export const noConversion: (x:opaqueFromRecords) => opaqueFromRecords = OpaqueBS.noConversion; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Records.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Records.gen.tsx index 701fb163a2..0c396022d1 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Records.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Records.gen.tsx @@ -1,49 +1,41 @@ /* TypeScript file generated from Records.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as RecordsBS__Es6Import from './Records.bs'; const RecordsBS: any = RecordsBS__Es6Import; import type {list} from '../src/shims/RescriptPervasives.shim'; -// eslint-disable-next-line consistent-type-definitions export type coord = { readonly x: number; readonly y: number; readonly z: (undefined | number) }; -// eslint-disable-next-line consistent-type-definitions export type person = { readonly name: string; readonly age: number; readonly address: (undefined | string) }; -// eslint-disable-next-line consistent-type-definitions export type business = { readonly name: string; readonly owner: (undefined | person); readonly address: (undefined | string) }; -// eslint-disable-next-line consistent-type-definitions export type payload = { readonly num: number; readonly payload: a }; -// eslint-disable-next-line consistent-type-definitions export type record = { readonly v: number; readonly w: number }; -// eslint-disable-next-line consistent-type-definitions export type business2 = { readonly name: string; readonly owner: (null | undefined | person); readonly address2: (null | undefined | string) }; -// eslint-disable-next-line consistent-type-definitions export type mix = { readonly a: number; readonly b: number; @@ -53,13 +45,10 @@ export type mix = { } }; -// eslint-disable-next-line consistent-type-definitions export type myRec = { readonly type: string }; -// eslint-disable-next-line consistent-type-definitions export type myObj = { readonly type_: string }; -// eslint-disable-next-line consistent-type-definitions export type myRecBsAs = { readonly jsValid0: string; readonly type: string; diff --git a/jscomp/gentype_tests/typescript-react-example/src/References.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/References.gen.tsx index c0c5f48747..d3d8d9b514 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/References.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/References.gen.tsx @@ -1,19 +1,15 @@ /* TypeScript file generated from References.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as ReferencesBS__Es6Import from './References.bs'; const ReferencesBS: any = ReferencesBS__Es6Import; -// eslint-disable-next-line max-classes-per-file naming-convention export abstract class R_t { protected opaque!: a }; /* simulate opaque types */ -// eslint-disable-next-line consistent-type-definitions export type t = R_t; -// eslint-disable-next-line consistent-type-definitions export type requiresConversion = { readonly x: number }; export const create: (x:number) => { contents: number } = ReferencesBS.create; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Shadow.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Shadow.gen.tsx index 9ec46fd63d..5b351b197c 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Shadow.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Shadow.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from Shadow.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as ShadowBS__Es6Import from './Shadow.bs'; const ShadowBS: any = ShadowBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.gen.tsx index f924a573c6..88a31f0e01 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from TestEmitInnerModules.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as TestEmitInnerModulesBS__Es6Import from './TestEmitInnerModules.bs'; const TestEmitInnerModulesBS: any = TestEmitInnerModulesBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.gen.tsx index 46feba73d3..9acb20dd21 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from TestFirstClassModules.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as TestFirstClassModulesBS__Es6Import from './TestFirstClassModules.bs'; const TestFirstClassModulesBS: any = TestFirstClassModulesBS__Es6Import; @@ -13,7 +12,6 @@ import type {firstClassModule as FirstClassModules_firstClassModule} from './Fir import type {record as FirstClassModulesInterface_record} from './FirstClassModulesInterface.gen'; -// eslint-disable-next-line consistent-type-definitions export type firstClassModuleWithTypeEquations = { readonly out: (_1:o) => o; readonly Inner: { readonly inn: (_1:i) => i } }; export const convert: (x:FirstClassModules_firstClassModule) => FirstClassModules_firstClassModule = TestFirstClassModulesBS.convert; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx index 9ba03d0981..c6ca222d2c 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from TestImmutableArray.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as TestImmutableArrayBS__Es6Import from './TestImmutableArray.bs'; const TestImmutableArrayBS: any = TestImmutableArrayBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.gen.tsx index 8801b8f1c2..96197ffdcc 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from TestModuleAliases.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as TestModuleAliasesBS__Es6Import from './TestModuleAliases.bs'; const TestModuleAliasesBS: any = TestModuleAliasesBS__Es6Import; @@ -15,28 +14,20 @@ import type {Outer_outer as ModuleAliases2_Outer_outer} from './ModuleAliases2.g import type {record as ModuleAliases2_record} from './ModuleAliases2.gen'; -// eslint-disable-next-line consistent-type-definitions export type OtherFile_record = { readonly x: number; readonly y: string }; -// eslint-disable-next-line consistent-type-definitions export type record = ModuleAliases2_record; -// eslint-disable-next-line consistent-type-definitions export type record2 = ModuleAliases2_record; -// eslint-disable-next-line consistent-type-definitions export type outer = ModuleAliases2_Outer_outer; -// eslint-disable-next-line consistent-type-definitions export type outer2 = ModuleAliases2_Outer_outer; -// eslint-disable-next-line consistent-type-definitions export type my2 = ModuleAliases2_Outer_Inner_inner; -// eslint-disable-next-line consistent-type-definitions export type inner1 = ModuleAliases2_InnerAlias_inner; -// eslint-disable-next-line consistent-type-definitions export type inner2 = ModuleAliases2_Outer_Inner_inner; export const testInner1: (x:inner1) => inner1 = TestModuleAliasesBS.testInner1; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx index d97f58e09d..5505f59301 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx @@ -1,19 +1,15 @@ /* TypeScript file generated from TestPromise.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as TestPromiseBS__Es6Import from './TestPromise.bs'; const TestPromiseBS: any = TestPromiseBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type promise = Promise; -// eslint-disable-next-line consistent-type-definitions export type fromPayload = { readonly x: number; readonly s: string }; -// eslint-disable-next-line consistent-type-definitions export type toPayload = { readonly result: string }; export const convert: (_1:Promise) => Promise = TestPromiseBS.convert; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx index 1928bc2db1..d27fd1baa8 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from TransitiveType1.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as TransitiveType1BS__Es6Import from './TransitiveType1.bs'; const TransitiveType1BS: any = TransitiveType1BS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.gen.tsx index 6bbc5469a0..02c9548b3a 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.gen.tsx @@ -1,11 +1,10 @@ /* TypeScript file generated from TransitiveType2.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ import type {t3 as TransitiveType3_t3} from './TransitiveType3.gen'; -// eslint-disable-next-line consistent-type-definitions export type t2 = (undefined | TransitiveType3_t3); -// eslint-disable-next-line consistent-type-definitions export type t2Alias = t2; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.gen.tsx index dd8236816a..21260a0d39 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.gen.tsx @@ -1,13 +1,11 @@ /* TypeScript file generated from TransitiveType3.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as TransitiveType3BS__Es6Import from './TransitiveType3.bs'; const TransitiveType3BS: any = TransitiveType3BS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type t3 = { readonly i: number; readonly s: string }; export const convertT3: (x:t3) => t3 = TransitiveType3BS.convertT3; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.gen.tsx index 246f51d0ed..1d8672b5e4 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.gen.tsx @@ -1,12 +1,10 @@ /* TypeScript file generated from TypeNameSanitize.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line consistent-type-definitions export type t_ = number; -// eslint-disable-next-line consistent-type-definitions export type M_t__ = number; -// eslint-disable-next-line consistent-type-definitions export type pair = [t_, M_t__]; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.gen.tsx index 17f11a4d4b..9ec2bad966 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.gen.tsx @@ -1,6 +1,6 @@ /* TypeScript file generated from TypeParams1.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line consistent-type-definitions export type ocaml_array = a[]; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.gen.tsx index 304a9b6abf..bef46e020b 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.gen.tsx @@ -1,14 +1,12 @@ /* TypeScript file generated from TypeParams2.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ import type {ocaml_array as TypeParams1_ocaml_array} from './TypeParams1.gen'; -// eslint-disable-next-line consistent-type-definitions export type item = { readonly id: number }; -// eslint-disable-next-line consistent-type-definitions export type items = TypeParams1_ocaml_array; -// eslint-disable-next-line consistent-type-definitions export type items2 = item[]; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.gen.tsx index 641d869dbf..46ff4963c1 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from TypeParams3.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as TypeParams3BS__Es6Import from './TypeParams3.bs'; const TypeParams3BS: any = TypeParams3BS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Unboxed.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Unboxed.gen.tsx index 331a1bc46f..ae18d4863d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Unboxed.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Unboxed.gen.tsx @@ -1,25 +1,19 @@ /* TypeScript file generated from Unboxed.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as UnboxedBS__Es6Import from './Unboxed.bs'; const UnboxedBS: any = UnboxedBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type v1 = number; -// eslint-disable-next-line consistent-type-definitions export type v2 = number; -// eslint-disable-next-line consistent-type-definitions export type r1 = number; -// eslint-disable-next-line consistent-type-definitions export type r2 = string; -// eslint-disable-next-line consistent-type-definitions export type t = number[] | number | ((_1:number) => number); export const testV1: (x:v1) => v1 = UnboxedBS.testV1; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Uncurried.gen.tsx index 0a9a42065e..0dea01f734 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Uncurried.gen.tsx @@ -1,28 +1,21 @@ /* TypeScript file generated from Uncurried.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as UncurriedBS__Es6Import from './Uncurried.bs'; const UncurriedBS: any = UncurriedBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type u0 = () => string; -// eslint-disable-next-line consistent-type-definitions export type u1 = (_1:number) => string; -// eslint-disable-next-line consistent-type-definitions export type u2 = (_1:number, _2:string) => string; -// eslint-disable-next-line consistent-type-definitions export type u3 = (_1:number, _2:string, _3:number) => string; -// eslint-disable-next-line consistent-type-definitions export type auth = { readonly login: () => string }; -// eslint-disable-next-line consistent-type-definitions export type authU = { readonly loginU: () => string }; export const uncurried0: () => string = UncurriedBS.uncurried0; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Usage.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Usage.gen.tsx index 907a73d79f..abe93d3ae6 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Usage.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Usage.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from Usage.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as UsageBS__Es6Import from './Usage.bs'; const UsageBS: any = UsageBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.gen.tsx index 977e69edae..e1b1995e3a 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from UseImportJsValue.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as UseImportJsValueBS__Es6Import from './UseImportJsValue.bs'; const UseImportJsValueBS: any = UseImportJsValueBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.gen.tsx index c528cfade0..2b55a93c66 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.gen.tsx @@ -1,6 +1,6 @@ /* TypeScript file generated from V3Compatibility.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line consistent-type-definitions export type cb = (_1:number) => string; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx index ecf327f5d1..433e8cac4c 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx @@ -1,15 +1,13 @@ /* TypeScript file generated from Variants.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as VariantsBS__Es6Import from './Variants.bs'; const VariantsBS: any = VariantsBS__Es6Import; import type {list} from '../src/shims/RescriptPervasives.shim'; -// eslint-disable-next-line consistent-type-definitions export type weekday = "monday" | "tuesday" @@ -19,42 +17,31 @@ export type weekday = | "saturday" | "sunday"; -// eslint-disable-next-line consistent-type-definitions export type testGenTypeAs = "type_" | "module_" | "fortytwo"; -// eslint-disable-next-line consistent-type-definitions export type testGenTypeAs2 = "type_" | "module" | 42; -// eslint-disable-next-line consistent-type-definitions export type testGenTypeAs3 = "type_" | "module" | 42; -// eslint-disable-next-line consistent-type-definitions export type x1 = "x" | "x1"; -// eslint-disable-next-line consistent-type-definitions export type x2 = "x" | "x2"; -// eslint-disable-next-line consistent-type-definitions export type type_ = "Type"; export type type = type_; -// eslint-disable-next-line consistent-type-definitions export type myList = "E" | { TAG: "C"; _0: number; _1: myList }; -// eslint-disable-next-line consistent-type-definitions export type builtinList = list; -// eslint-disable-next-line consistent-type-definitions export type result1 = { TAG: "Ok"; _0: a } | { TAG: "Error"; _0: b }; -// eslint-disable-next-line consistent-type-definitions export type result2 = { TAG: "Ok"; _0: a } | { TAG: "Error"; _0: b }; -// eslint-disable-next-line consistent-type-definitions export type result3 = { TAG: "Ok"; _0: a } | { TAG: "Error"; _0: b }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.gen.tsx index f52c2c780a..65f55baef7 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.gen.tsx @@ -1,16 +1,13 @@ /* TypeScript file generated from VariantsWithPayload.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as VariantsWithPayloadBS__Es6Import from './VariantsWithPayload.bs'; const VariantsWithPayloadBS: any = VariantsWithPayloadBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type payload = { readonly x: number; readonly y?: string }; -// eslint-disable-next-line consistent-type-definitions export type withPayload = "a" | "b" @@ -19,16 +16,13 @@ export type withPayload = | "Half" | { NAME: "c"; VAL: payload }; -// eslint-disable-next-line consistent-type-definitions export type manyPayloads = { NAME: "one"; VAL: number } | { NAME: "two"; VAL: [string, string] } | { NAME: "three"; VAL: payload }; -// eslint-disable-next-line consistent-type-definitions export type simpleVariant = "A" | "B" | "C"; -// eslint-disable-next-line consistent-type-definitions export type variantWithPayloads = "A" | { TAG: "B"; _0: number } @@ -36,10 +30,8 @@ export type variantWithPayloads = | { TAG: "D"; _0: number; _1: number } | { TAG: "E"; _0: number; _1: string; _2: number }; -// eslint-disable-next-line consistent-type-definitions export type variant1Int = { TAG: "R"; _0: number }; -// eslint-disable-next-line consistent-type-definitions export type variant1Object = { TAG: "R"; _0: payload }; export const testWithPayload: (x:withPayload) => withPayload = VariantsWithPayloadBS.testWithPayload; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx index c74f5978a2..92663ae709 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from Warnings.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as WarningsBS__Es6Import from './Warnings.bs'; const WarningsBS: any = WarningsBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Wrapper.gen.tsx index 17b81e8930..ad8868f99d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Wrapper.gen.tsx @@ -1,13 +1,11 @@ /* TypeScript file generated from Wrapper.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as WrapperBS__Es6Import from './Wrapper.bs'; const WrapperBS: any = WrapperBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type MyModuleAlias_t = number; export const MyModuleAlias_add: (_1:MyModuleAlias_t, _2:MyModuleAlias_t) => MyModuleAlias_t = WrapperBS.MyModuleAlias.add; diff --git a/jscomp/gentype_tests/typescript-react-example/src/counter.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/counter.gen.tsx index a550481c9d..62149b2e59 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/counter.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/counter.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from counter.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as counterBS__Es6Import from './counter.bs'; const counterBS: any = counterBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/index.tsx b/jscomp/gentype_tests/typescript-react-example/src/index.tsx index 14bc1a0134..c9c9a2bdfb 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/index.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/index.tsx @@ -21,7 +21,6 @@ import { } from "./VariantsWithPayload.gen"; import * as TestPromise from "./TestPromise.gen"; -// tslint:disable-next-line:no-console const consoleLog = console.log; const intList = Types.map((x) => x + 1, Types.someIntList); @@ -129,6 +128,7 @@ TestPromise.convert(Promise.resolve({ x: 3, s: "hello" })).then((x) => type Props = { readonly method?: "push" | "replace"; }; +// eslint-disable-next-line @typescript-eslint/no-unused-vars export const make: React.FC = (x: Props) => { return
; }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/location/location.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/location/location.gen.tsx index 40ee0818c3..d5a66cf1ec 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/location/location.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/location/location.gen.tsx @@ -1,6 +1,6 @@ /* TypeScript file generated from location.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line consistent-type-definitions export type t = { readonly id: string; readonly name: string }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.gen.tsx index 14dc1dc709..2d97146ee2 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.gen.tsx @@ -1,22 +1,17 @@ /* TypeScript file generated from Tuples.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as TuplesBS__Es6Import from './Tuples.bs'; const TuplesBS: any = TuplesBS__Es6Import; -// eslint-disable-next-line consistent-type-definitions export type coord = [number, number, (undefined | number)]; -// eslint-disable-next-line consistent-type-definitions export type coord2 = [number, number, (null | undefined | number)]; -// eslint-disable-next-line consistent-type-definitions export type person = { readonly name: string; readonly age: number }; -// eslint-disable-next-line consistent-type-definitions export type couple = [person, person]; export const testTuple: (param:[number, number]) => number = TuplesBS.testTuple; diff --git a/jscomp/gentype_tests/typescript-react-example/src/nested/Types.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/nested/Types.gen.tsx index 67c489e63d..7ec83fc4df 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/nested/Types.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/nested/Types.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from Types.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as TypesBS__Es6Import from './Types.bs'; const TypesBS: any = TypesBS__Es6Import; @@ -17,55 +16,40 @@ import type {t_ as TypeNameSanitize_t_} from '../../src/TypeNameSanitize.gen'; import type {t as Location_t} from '../../src/location/location.gen'; -// eslint-disable-next-line consistent-type-definitions export type t = number; -// eslint-disable-next-line consistent-type-definitions export type typeWithVars = { TAG: "A"; _0: x; _1: y } | { TAG: "B"; _0: z }; -// eslint-disable-next-line consistent-type-definitions export type tree = { readonly label: string; readonly left?: tree; readonly right?: tree }; -// eslint-disable-next-line consistent-type-definitions export type selfRecursive = { readonly self: selfRecursive }; -// eslint-disable-next-line consistent-type-definitions export type mutuallyRecursiveA = { readonly b: mutuallyRecursiveB }; -// eslint-disable-next-line consistent-type-definitions export type mutuallyRecursiveB = { readonly a: mutuallyRecursiveA }; -// eslint-disable-next-line max-classes-per-file naming-convention export abstract class opaqueVariant { protected opaque!: any }; /* simulate opaque types */ -// eslint-disable-next-line consistent-type-definitions export type twice = [a, a]; -// eslint-disable-next-line consistent-type-definitions export type genTypeMispelled = number; -// eslint-disable-next-line consistent-type-definitions export type dictString = {[id: string]: string}; -// eslint-disable-next-line consistent-type-definitions export type nullOrString = (null | string); -// eslint-disable-next-line consistent-type-definitions export type nullOrString2 = (null | string); -// eslint-disable-next-line consistent-type-definitions export type record = { readonly i: number; readonly s: string }; -// eslint-disable-next-line consistent-type-definitions export type decorator = (_1:a) => b; -// eslint-disable-next-line consistent-type-definitions export type marshalFields = { readonly _rec: string; readonly _switch: string; @@ -78,35 +62,25 @@ export type marshalFields = { readonly _Uppercase__: string }; -// eslint-disable-next-line consistent-type-definitions export type marshalMutableField = { _match: number }; -// eslint-disable-next-line consistent-type-definitions export type ocaml_array = a[]; -// eslint-disable-next-line consistent-type-definitions export type someRecord = { readonly id: number }; -// eslint-disable-next-line consistent-type-definitions export type instantiateTypeParameter = ocaml_array; -// eslint-disable-next-line consistent-type-definitions export type vector = [a, a]; export type Vector = vector; -// eslint-disable-next-line consistent-type-definitions export type date = Date; -// eslint-disable-next-line consistent-type-definitions export type i64A = [number, number]; -// eslint-disable-next-line consistent-type-definitions export type i64B = [number, number]; -// eslint-disable-next-line consistent-type-definitions export type ObjectId_t = number; -// eslint-disable-next-line consistent-type-definitions export type tPrimed = [TypeNameSanitize_t_, TypeNameSanitize_M_t__]; export const someIntList: list = TypesBS.someIntList; diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.gen.tsx index 9e60031766..b9335e6494 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from 404.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as _404BS__Es6Import from './404.bs'; const _404BS: any = _404BS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.gen.tsx index 784765575a..a57734235d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from AppModal.web.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as AppModal_webBS__Es6Import from './AppModal.web.bs'; const AppModal_webBS: any = AppModal_webBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.gen.tsx index 737f1e3df0..6cc6826931 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from _under.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as _underBS__Es6Import from './_under.bs'; const _underBS: any = _underBS__Es6Import; diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.gen.tsx index eb44a28a17..0225f5acba 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.gen.tsx @@ -1,9 +1,8 @@ /* TypeScript file generated from with_underscore.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore: Implicit any on import import * as with_underscoreBS__Es6Import from './with_underscore.bs'; const with_underscoreBS: any = with_underscoreBS__Es6Import; diff --git a/jscomp/test/variantsMatching.gen.tsx b/jscomp/test/variantsMatching.gen.tsx index 7f3377cea2..1f281b4510 100644 --- a/jscomp/test/variantsMatching.gen.tsx +++ b/jscomp/test/variantsMatching.gen.tsx @@ -1,24 +1,18 @@ /* TypeScript file generated from variantsMatching.res by genType. */ -/* eslint-disable import/first */ +/* eslint-disable */ +/* tslint:disable */ -// eslint-disable-next-line consistent-type-definitions export type t = "thisIsA" | 42 | null | "D" | 3.14; -// eslint-disable-next-line consistent-type-definitions export type tNU = null | undefined; -// eslint-disable-next-line consistent-type-definitions export type MyUndefined_t = undefined | a; -// eslint-disable-next-line consistent-type-definitions export type MyNull_t = null | a; -// eslint-disable-next-line consistent-type-definitions export type MyNullable_t = null | undefined | a; -// eslint-disable-next-line consistent-type-definitions export type MyNullableExtended_t = null | undefined | "WhyNotAnotherOne" | a; -// eslint-disable-next-line consistent-type-definitions export type UntaggedWithBool_t = string | number | boolean | string; From d706e7e1d9a77a097705ab947ee2b905901da8ac Mon Sep 17 00:00:00 2001 From: Hyeseong Kim Date: Thu, 19 Oct 2023 20:59:03 +0900 Subject: [PATCH 8/8] [skip ci] remove an unused suppression comment --- jscomp/gentype_tests/typescript-react-example/src/App.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/jscomp/gentype_tests/typescript-react-example/src/App.tsx b/jscomp/gentype_tests/typescript-react-example/src/App.tsx index 5ffa6f9f93..3169d1d329 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/App.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/App.tsx @@ -1,8 +1,6 @@ import * as React from "react"; import "./App.css"; - -// tslint:disable-next-line:interface-name export interface Props { name: string; count?: number;