diff --git a/CHANGELOG.md b/CHANGELOG.md index 4db9fdfdcf..2d96be4665 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,10 @@ - GenType: support `@deriving(accessors)` outputs. https://github.com/rescript-lang/rescript-compiler/pull/6537 - Allow coercing ints and floats to unboxed variants that have a catch-all unboxed int or float case. https://github.com/rescript-lang/rescript-compiler/pull/6540 +#### :bug: Bug Fix + +- GenType: now emits full suffix on JS import path to be compatible with `.res.js`. https://github.com/rescript-lang/rescript-compiler/pull/6541 + # 11.0.0-rc.8 #### :rocket: New Feature diff --git a/jscomp/gentype/EmitJs.ml b/jscomp/gentype/EmitJs.ml index 34f4ab007d..ec289babdf 100644 --- a/jscomp/gentype/EmitJs.ml +++ b/jscomp/gentype/EmitJs.ml @@ -247,9 +247,9 @@ let emitCodeItem ~config ~emitters ~moduleItemsEmitter ~env ~fileName |> ModuleResolver.resolveModule ~config ~importExtension:config.suffix ~outputFileRelative ~resolver ~useBsDependencies:false in - let fileNameBs = fileName |> ModuleName.forBsFile in + let fileNameJs = fileName |> ModuleName.forJsFile in let envWithRequires = - fileNameBs |> requireModule ~import:false ~env ~importPath + fileNameJs |> requireModule ~import:false ~env ~importPath in let default = "default" in let make = "make" in @@ -358,7 +358,7 @@ let emitCodeItem ~config ~emitters ~moduleItemsEmitter ~env ~fileName | _ -> emitters in let emitters = - (fileNameBs |> ModuleName.toString) + (fileNameJs |> ModuleName.toString) ^ "." ^ (moduleAccessPath |> Runtime.emitModuleAccessPath ~config) |> EmitType.emitExportConst ~config ~docString ~early:false ~emitters diff --git a/jscomp/gentype/EmitType.ml b/jscomp/gentype/EmitType.ml index 960418c8cb..349d9215a0 100644 --- a/jscomp/gentype/EmitType.ml +++ b/jscomp/gentype/EmitType.ml @@ -378,13 +378,6 @@ let emitImportValueAsEarly ~emitters ~name ~nameAs importPath = let emitRequire ~importedValueOrComponent ~early ~emitters ~(config : Config.t) ~moduleName importPath = - let importPath = - match config.moduleResolution with - | Node -> - importPath - |> ImportPath.chopExtensionSafe (* for backward compatibility *) - | _ -> importPath - in let moduleNameString = ModuleName.toString moduleName in let importPathString = ImportPath.emit importPath in let output = diff --git a/jscomp/gentype/ModuleName.ml b/jscomp/gentype/ModuleName.ml index 0ffb8f15be..549942e594 100644 --- a/jscomp/gentype/ModuleName.ml +++ b/jscomp/gentype/ModuleName.ml @@ -17,10 +17,10 @@ let sanitizeId s = then s else "_" ^ s -let forBsFile s = sanitizeId s ^ "BS" +let forJsFile s = sanitizeId s ^ "JS" let forInnerModule ~fileName ~innerModuleName = - (fileName |> forBsFile) ^ "." ^ innerModuleName + (fileName |> forJsFile) ^ "." ^ innerModuleName let fromStringUnsafe s = s let toString s = s diff --git a/jscomp/gentype/ModuleName.mli b/jscomp/gentype/ModuleName.mli index 19d04052fc..bf1fa3d118 100644 --- a/jscomp/gentype/ModuleName.mli +++ b/jscomp/gentype/ModuleName.mli @@ -2,7 +2,7 @@ type t val compare : t -> t -> int val curry : t -val forBsFile : t -> t +val forJsFile : t -> t val forInnerModule : fileName:t -> innerModuleName:string -> t val fromStringUnsafe : string -> t diff --git a/jscomp/gentype_tests/typescript-react-example/.eslintrc.json b/jscomp/gentype_tests/typescript-react-example/.eslintrc.json index d0b868ecfa..0eba27d5e7 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"], + "ignorePatterns": ["src/**/*.res.js"], "root": true } diff --git a/jscomp/gentype_tests/typescript-react-example/Makefile b/jscomp/gentype_tests/typescript-react-example/Makefile index 284dbe2eae..e1f64bccb5 100644 --- a/jscomp/gentype_tests/typescript-react-example/Makefile +++ b/jscomp/gentype_tests/typescript-react-example/Makefile @@ -7,7 +7,7 @@ test: npm run lint clean: - rm -rf node_modules lib src/*.bs.js src/*.gen.tsx + rm -rf node_modules lib src/*.res.js src/*.gen.tsx .DEFAULT_GOAL := test diff --git a/jscomp/gentype_tests/typescript-react-example/rescript.json b/jscomp/gentype_tests/typescript-react-example/rescript.json index fcb209e06a..1e12553c13 100644 --- a/jscomp/gentype_tests/typescript-react-example/rescript.json +++ b/jscomp/gentype_tests/typescript-react-example/rescript.json @@ -29,5 +29,5 @@ "module": "es6", "in-source": true }, - "suffix": ".bs.js" + "suffix": ".res.js" } diff --git a/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.bs.js b/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/BigInt.bs.js b/jscomp/gentype_tests/typescript-react-example/src/BigInt.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/BigInt.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/BigInt.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/BootloaderResource.bs.js b/jscomp/gentype_tests/typescript-react-example/src/BootloaderResource.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/BootloaderResource.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/BootloaderResource.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.bs.js b/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res.js 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 94dbeca3f5..584da010cf 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as CommentsBS from './Comments.bs'; +import * as CommentsJS from './Comments.res.js'; export type DecideSubject_payload = { /** A hint to use as a guide when thinking of your poem. */ @@ -23,8 +23,8 @@ export type DecideSubject_output = { }; /** Decide on a subject matter for a poem. */ -export const DecideSubject__placeholder: (run:string, times:number) => void = CommentsBS.DecideSubject._placeholder as any; +export const DecideSubject__placeholder: (run:string, times:number) => void = CommentsJS.DecideSubject._placeholder as any; export const DecideSubject: { /** Decide on a subject matter for a poem. */ -_placeholder: (run:string, times:number) => void } = CommentsBS.DecideSubject as any; +_placeholder: (run:string, times:number) => void } = CommentsJS.DecideSubject as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Comments.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Comments.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Comments.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Comments.res.js 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 eb19d0a1fb..08e72401d0 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx @@ -19,7 +19,7 @@ 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 as any; -const CoreBS = require('./Core.bs'); +const CoreJS = require('./Core.res.js'); export type variant = "A" | { TAG: "B"; _0: string }; @@ -27,46 +27,46 @@ export type t1 = { readonly x?: string }; export type t2 = { readonly x: (undefined | string) }; -export const null0: (x:(null | number)) => (null | number) = CoreBS.null0 as any; +export const null0: (x:(null | number)) => (null | number) = CoreJS.null0 as any; -export const null1: (x:(null | number)) => (null | number) = CoreBS.null1 as any; +export const null1: (x:(null | number)) => (null | number) = CoreJS.null1 as any; -export const nullable0: (x:(null | undefined | number)) => (null | undefined | number) = CoreBS.nullable0 as any; +export const nullable0: (x:(null | undefined | number)) => (null | undefined | number) = CoreJS.nullable0 as any; -export const nullable1: (x:(null | undefined | number)) => (null | undefined | number) = CoreBS.nullable1 as any; +export const nullable1: (x:(null | undefined | number)) => (null | undefined | number) = CoreJS.nullable1 as any; -export const undefined0: (x:(undefined | number)) => (undefined | number) = CoreBS.undefined0 as any; +export const undefined0: (x:(undefined | number)) => (undefined | number) = CoreJS.undefined0 as any; -export const undefined1: (x:(undefined | number)) => (undefined | number) = CoreBS.undefined1 as any; +export const undefined1: (x:(undefined | number)) => (undefined | number) = CoreJS.undefined1 as any; -export const dict0: (x:{[id: string]: string}) => {[id: string]: string} = CoreBS.dict0 as any; +export const dict0: (x:{[id: string]: string}) => {[id: string]: string} = CoreJS.dict0 as any; -export const dict1: (x:{[id: string]: string}) => {[id: string]: string} = CoreBS.dict1 as any; +export const dict1: (x:{[id: string]: string}) => {[id: string]: string} = CoreJS.dict1 as any; -export const promise0: (x:Promise) => Promise = CoreBS.promise0 as any; +export const promise0: (x:Promise) => Promise = CoreJS.promise0 as any; -export const promise1: (x:Promise) => Promise = CoreBS.promise1 as any; +export const promise1: (x:Promise) => Promise = CoreJS.promise1 as any; -export const date0: (x:Date) => Date = CoreBS.date0 as any; +export const date0: (x:Date) => Date = CoreJS.date0 as any; -export const date1: (x:Date) => Date = CoreBS.date1 as any; +export const date1: (x:Date) => Date = CoreJS.date1 as any; -export const bigint0: (x:BigInt) => BigInt = CoreBS.bigint0 as any; +export const bigint0: (x:BigInt) => BigInt = CoreJS.bigint0 as any; -export const bigint1: (x:BigInt) => BigInt = CoreBS.bigint1 as any; +export const bigint1: (x:BigInt) => BigInt = CoreJS.bigint1 as any; -export const regexp0: (x:RegExp) => RegExp = CoreBS.regexp0 as any; +export const regexp0: (x:RegExp) => RegExp = CoreJS.regexp0 as any; -export const regexp1: (x:RegExp) => RegExp = CoreBS.regexp1 as any; +export const regexp1: (x:RegExp) => RegExp = CoreJS.regexp1 as any; -export const map1: (x:Map) => Map = CoreBS.map1 as any; +export const map1: (x:Map) => Map = CoreJS.map1 as any; -export const weakmap1: (x:WeakMap) => WeakMap = CoreBS.weakmap1 as any; +export const weakmap1: (x:WeakMap) => WeakMap = CoreJS.weakmap1 as any; -export const set1: (x:Set) => Set = CoreBS.set1 as any; +export const set1: (x:Set) => Set = CoreJS.set1 as any; -export const weakset1: (x:WeakSet) => WeakSet = CoreBS.weakset1 as any; +export const weakset1: (x:WeakSet) => WeakSet = CoreJS.weakset1 as any; -export const option0: (x:(undefined | string)) => (undefined | string) = CoreBS.option0 as any; +export const option0: (x:(undefined | string)) => (undefined | string) = CoreJS.option0 as any; -export const option1: (x:(undefined | variant)) => (undefined | variant) = CoreBS.option1 as any; +export const option1: (x:(undefined | variant)) => (undefined | variant) = CoreJS.option1 as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Core.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Core.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Core.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Core.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.bs.js b/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res.js similarity index 87% rename from jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res.js index d7b40f0681..858279113e 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.bs.js +++ b/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE import * as Curry from "rescript/lib/es6/curry.js"; -import * as ErrorHandler from "./ErrorHandler.bs.js"; +import * as ErrorHandler from "./ErrorHandler.res.js"; function notification(s) { return [ diff --git a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler2.bs.js b/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler2.res.js similarity index 85% rename from jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler2.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler2.res.js index 920ecbad57..ef8547fe5f 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler2.bs.js +++ b/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler2.res.js @@ -1,6 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE -import * as ErrorHandler from "./ErrorHandler.bs.js"; +import * as ErrorHandler from "./ErrorHandler.res.js"; function notification(n) { return [ diff --git a/jscomp/gentype_tests/typescript-react-example/src/Date.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Date.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Date.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Date.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/Derivings.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Derivings.gen.tsx index 38d8b3291f..5a23227fc9 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Derivings.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Derivings.gen.tsx @@ -3,15 +3,15 @@ /* eslint-disable */ /* tslint:disable */ -import * as DerivingsBS from './Derivings.bs'; +import * as DerivingsJS from './Derivings.res.js'; export type action = "Click" | "Cancel" | { TAG: "Submit"; _0: string }; -export const click: action = DerivingsBS.click as any; +export const click: action = DerivingsJS.click as any; -export const submit: (_1:string) => action = DerivingsBS.submit as any; +export const submit: (_1:string) => action = DerivingsJS.submit as any; -export const cancel: action = DerivingsBS.cancel as any; +export const cancel: action = DerivingsJS.cancel as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Derivings.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Derivings.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Derivings.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Derivings.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/Dict.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Dict.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Dict.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Dict.res.js 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 a5bc1522a6..d6bbe2074e 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx @@ -3,46 +3,46 @@ /* eslint-disable */ /* tslint:disable */ -import * as DocstringsBS from './Docstrings.bs'; +import * as DocstringsJS from './Docstrings.res.js'; export type t = "A" | "B"; /** hello */ -export const flat: number = DocstringsBS.flat as any; +export const flat: number = DocstringsJS.flat as any; /** \n * Sign a message with a key.\n *\n * @param message - A message to be signed\n * @param key - The key with which to sign the message\n * @returns A signed message\n */ -export const signMessage: (message:string, key:number) => string = DocstringsBS.signMessage as any; +export const signMessage: (message:string, key:number) => string = DocstringsJS.signMessage as any; -export const one: (a:number) => number = DocstringsBS.one as any; +export const one: (a:number) => number = DocstringsJS.one as any; -export const two: (a:number, b:number) => number = DocstringsBS.two as any; +export const two: (a:number, b:number) => number = DocstringsJS.two as any; -export const tree: (a:number, b:number, c:number) => number = DocstringsBS.tree as any; +export const tree: (a:number, b:number, c:number) => number = DocstringsJS.tree as any; -export const oneU: (a:number) => number = DocstringsBS.oneU as any; +export const oneU: (a:number) => number = DocstringsJS.oneU as any; -export const twoU: (a:number, b:number) => number = DocstringsBS.twoU as any; +export const twoU: (a:number, b:number) => number = DocstringsJS.twoU as any; -export const treeU: (a:number, b:number, c:number) => number = DocstringsBS.treeU as any; +export const treeU: (a:number, b:number, c:number) => number = DocstringsJS.treeU as any; -export const useParam: (param:number) => number = DocstringsBS.useParam as any; +export const useParam: (param:number) => number = DocstringsJS.useParam as any; -export const useParamU: (param:number) => number = DocstringsBS.useParamU as any; +export const useParamU: (param:number) => number = DocstringsJS.useParamU as any; -export const unnamed1: (param:number) => number = DocstringsBS.unnamed1 as any; +export const unnamed1: (param:number) => number = DocstringsJS.unnamed1 as any; -export const unnamed1U: (param:number) => number = DocstringsBS.unnamed1U as any; +export const unnamed1U: (param:number) => number = DocstringsJS.unnamed1U as any; -export const unnamed2: (param_0:number, param_1:number) => number = DocstringsBS.unnamed2 as any; +export const unnamed2: (param_0:number, param_1:number) => number = DocstringsJS.unnamed2 as any; -export const unnamed2U: (param_0:number, param_1:number) => number = DocstringsBS.unnamed2U as any; +export const unnamed2U: (param_0:number, param_1:number) => number = DocstringsJS.unnamed2U as any; -export const grouped: (x:number, y:number, a:number, b:number, c:number, z:number) => number = DocstringsBS.grouped as any; +export const grouped: (x:number, y:number, a:number, b:number, c:number, z:number) => number = DocstringsJS.grouped as any; -export const unitArgWithoutConversion: () => string = DocstringsBS.unitArgWithoutConversion as any; +export const unitArgWithoutConversion: () => string = DocstringsJS.unitArgWithoutConversion as any; -export const unitArgWithoutConversionU: () => string = DocstringsBS.unitArgWithoutConversionU as any; +export const unitArgWithoutConversionU: () => string = DocstringsJS.unitArgWithoutConversionU as any; -export const unitArgWithConversion: () => t = DocstringsBS.unitArgWithConversion as any; +export const unitArgWithConversion: () => t = DocstringsJS.unitArgWithConversion as any; -export const unitArgWithConversionU: () => t = DocstringsBS.unitArgWithConversionU as any; +export const unitArgWithConversionU: () => t = DocstringsJS.unitArgWithConversionU as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Docstrings.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Docstrings.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Docstrings.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Docstrings.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/DynamicallyLoadedComponent.bs.js b/jscomp/gentype_tests/typescript-react-example/src/DynamicallyLoadedComponent.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/DynamicallyLoadedComponent.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/DynamicallyLoadedComponent.res.js 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 00d737b1b8..0bfa420df3 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.gen.tsx @@ -3,16 +3,16 @@ /* eslint-disable */ /* tslint:disable */ -import * as EmitModuleIfNoConversionBS from './EmitModuleIfNoConversion.bs'; +import * as EmitModuleIfNoConversionJS from './EmitModuleIfNoConversion.res.js'; export type t = "A" | { TAG: "B"; readonly name: string }; -export const X_foo: (t:t) => void = EmitModuleIfNoConversionBS.X.foo as any; +export const X_foo: (t:t) => void = EmitModuleIfNoConversionJS.X.foo as any; -export const X_x: number = EmitModuleIfNoConversionBS.X.x as any; +export const X_x: number = EmitModuleIfNoConversionJS.X.x as any; -export const Y_x: string = EmitModuleIfNoConversionBS.Y.x as any; +export const Y_x: string = EmitModuleIfNoConversionJS.Y.x as any; -export const Y: { x: string } = EmitModuleIfNoConversionBS.Y as any; +export const Y: { x: string } = EmitModuleIfNoConversionJS.Y as any; -export const X: { x: number; foo: (t:t) => void } = EmitModuleIfNoConversionBS.X as any; +export const X: { x: number; foo: (t:t) => void } = EmitModuleIfNoConversionJS.X as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.bs.js b/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.bs.js b/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.res.js 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 5d574160e8..78737da02d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx @@ -5,8 +5,8 @@ import * as React from 'react'; -import * as ExportWithRenameBS from './ExportWithRename.bs'; +import * as ExportWithRenameJS from './ExportWithRename.res.js'; export type Props = { readonly s: string }; -export const Renamed: React.ComponentType<{ readonly s: string }> = ExportWithRenameBS.make as any; +export const Renamed: React.ComponentType<{ readonly s: string }> = ExportWithRenameJS.make as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.bs.js b/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.res.js 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 fdbd231326..3b0d202e02 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as FirstClassModulesBS from './FirstClassModules.bs'; +import * as FirstClassModulesJS from './FirstClassModules.res.js'; export type MT_t = number; @@ -23,7 +23,7 @@ export type firstClassModule = { readonly y: string }; -export const firstClassModule: firstClassModule = FirstClassModulesBS.firstClassModule as any; +export const firstClassModule: firstClassModule = FirstClassModulesJS.firstClassModule as any; export const testConvert: (m:{ readonly x: number; @@ -49,7 +49,7 @@ export const testConvert: (m:{ }; readonly Z: unknown; readonly y: string -} = FirstClassModulesBS.testConvert as any; +} = FirstClassModulesJS.testConvert as any; export const someFunctorAsFunction: (x:{ readonly x: number; @@ -63,4 +63,4 @@ export const someFunctorAsFunction: (x:{ }; readonly Z: unknown; readonly y: string -}) => { readonly ww: string } = FirstClassModulesBS.someFunctorAsFunction as any; +}) => { readonly ww: string } = FirstClassModulesJS.someFunctorAsFunction as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.bs.js b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.bs.js b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/GADT.bs.js b/jscomp/gentype_tests/typescript-react-example/src/GADT.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/GADT.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/GADT.res.js 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 8e93393415..39f83f9fdc 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Hooks.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Hooks.gen.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; -import * as HooksBS from './Hooks.bs'; +import * as HooksJS from './Hooks.res.js'; import type {TypedArray2_Uint8Array_t as Js_TypedArray2_Uint8Array_t} from '../src/shims/Js.shim'; @@ -27,35 +27,35 @@ export type testDomRef2 = React.Ref; export type Props = { readonly vehicle: vehicle }; -export const $$default: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.default as any; +export const $$default: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.default as any; export default $$default; 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 as any; +export const Another_anotherComponent: React.ComponentType<{ readonly callback: () => void; readonly vehicle: vehicle }> = HooksJS.Another.anotherComponent as any; export type Inner_make_Props = { readonly vehicle: vehicle }; -export const Inner_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.Inner.make as any; +export const Inner_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Inner.make as any; export type Inner_Another_anotherComponent_Props = { readonly vehicle: vehicle }; -export const Inner_Another_anotherComponent: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.Inner.Another.anotherComponent as any; +export const Inner_Another_anotherComponent: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Inner.Another.anotherComponent as any; export type Inner_Inner2_make_Props = { readonly vehicle: vehicle }; -export const Inner_Inner2_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.Inner.Inner2.make as any; +export const Inner_Inner2_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Inner.Inner2.make as any; 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 as any; +export const Inner_Inner2_Another_anotherComponent: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Inner.Inner2.Another.anotherComponent as any; export type NoProps_make_Props = {}; -export const NoProps_make: React.ComponentType<{}> = HooksBS.NoProps.make as any; +export const NoProps_make: React.ComponentType<{}> = HooksJS.NoProps.make as any; -export const functionWithRenamedArgs: (_to:vehicle, _Type:vehicle, cb:cb) => string = HooksBS.functionWithRenamedArgs as any; +export const functionWithRenamedArgs: (_to:vehicle, _Type:vehicle, cb:cb) => string = HooksJS.functionWithRenamedArgs as any; export type WithRename_componentWithRenamedArgs_Props = { readonly _Type: vehicle; @@ -67,39 +67,39 @@ export const WithRename_componentWithRenamedArgs: React.ComponentType<{ readonly _Type: vehicle; readonly _to: vehicle; readonly cb: cb -}> = HooksBS.WithRename.componentWithRenamedArgs as any; +}> = HooksJS.WithRename.componentWithRenamedArgs as any; -export const WithRef_makeWithRef: (_1:{ readonly vehicle: vehicle }, _2:(null | undefined | any)) => JSX.Element = HooksBS.WithRef.makeWithRef as any; +export const WithRef_makeWithRef: (_1:{ readonly vehicle: vehicle }, _2:(null | undefined | any)) => JSX.Element = HooksJS.WithRef.makeWithRef as any; export type testForwardRef_Props = { readonly vehicle: vehicle }; -export const testForwardRef: React.ComponentType<{ readonly vehicle: vehicle }> = HooksBS.testForwardRef as any; +export const testForwardRef: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.testForwardRef as any; export type ForwardRef_input_Props = { readonly r: r }; -export const ForwardRef_input: React.ComponentType<{ readonly r: r }> = HooksBS.ForwardRef.input as any; +export const ForwardRef_input: React.ComponentType<{ readonly r: r }> = HooksJS.ForwardRef.input as any; export type Poly_polymorphicComponent_Props = { readonly p: [vehicle, T1] }; -export const Poly_polymorphicComponent: React.ComponentType<{ readonly p: [vehicle, any] }> = HooksBS.Poly.polymorphicComponent as any; +export const Poly_polymorphicComponent: React.ComponentType<{ readonly p: [vehicle, any] }> = HooksJS.Poly.polymorphicComponent as any; export type Fun_functionReturningReactElement_Props = { readonly name: string }; -export const Fun_functionReturningReactElement: React.ComponentType<{ readonly name: string }> = HooksBS.Fun.functionReturningReactElement as any; +export const Fun_functionReturningReactElement: React.ComponentType<{ readonly name: string }> = HooksJS.Fun.functionReturningReactElement as any; 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 as any; +export const RenderPropRequiresConversion_make: React.ComponentType<{ readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> }> = HooksJS.RenderPropRequiresConversion.make as any; 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 as any; +export const WithChildren_aComponentWithChildren: React.ComponentType<{ readonly children: React.ReactNode; readonly vehicle: vehicle }> = HooksJS.WithChildren.aComponentWithChildren as any; 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 as any; +export const DD_make: React.ComponentType<{ readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string }> = HooksJS.DD.make as any; -export const NoProps: { make: React.ComponentType<{}> } = HooksBS.NoProps as any; +export const NoProps: { make: React.ComponentType<{}> } = HooksJS.NoProps as any; export const Inner: { Inner2: { @@ -120,26 +120,26 @@ export const Inner: { make: React.ComponentType<{ readonly vehicle: vehicle }> -} = HooksBS.Inner as any; +} = HooksJS.Inner as any; -export const RenderPropRequiresConversion: { make: React.ComponentType<{ readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> }> } = HooksBS.RenderPropRequiresConversion as any; +export const RenderPropRequiresConversion: { make: React.ComponentType<{ readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> }> } = HooksJS.RenderPropRequiresConversion as any; export const WithRename: { componentWithRenamedArgs: React.ComponentType<{ readonly _Type: vehicle; readonly _to: vehicle; readonly cb: cb -}> } = HooksBS.WithRename as any; +}> } = HooksJS.WithRename as any; -export const ForwardRef: { input: React.ComponentType<{ readonly r: r }> } = HooksBS.ForwardRef as any; +export const ForwardRef: { input: React.ComponentType<{ readonly r: r }> } = HooksJS.ForwardRef as any; -export const Fun: { functionReturningReactElement: React.ComponentType<{ readonly name: string }> } = HooksBS.Fun as any; +export const Fun: { functionReturningReactElement: React.ComponentType<{ readonly name: string }> } = HooksJS.Fun as any; -export const WithRef: { makeWithRef: (_1:{ readonly vehicle: vehicle }, _2:(null | undefined | any)) => JSX.Element } = HooksBS.WithRef as any; +export const WithRef: { makeWithRef: (_1:{ readonly vehicle: vehicle }, _2:(null | undefined | any)) => JSX.Element } = HooksJS.WithRef as any; -export const WithChildren: { aComponentWithChildren: React.ComponentType<{ readonly children: React.ReactNode; readonly vehicle: vehicle }> } = HooksBS.WithChildren as any; +export const WithChildren: { aComponentWithChildren: React.ComponentType<{ readonly children: React.ReactNode; readonly vehicle: vehicle }> } = HooksJS.WithChildren as any; -export const DD: { make: React.ComponentType<{ readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string }> } = HooksBS.DD as any; +export const DD: { make: React.ComponentType<{ readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string }> } = HooksJS.DD as any; -export const Another: { anotherComponent: React.ComponentType<{ readonly callback: () => void; readonly vehicle: vehicle }> } = HooksBS.Another as any; +export const Another: { anotherComponent: React.ComponentType<{ readonly callback: () => void; readonly vehicle: vehicle }> } = HooksJS.Another as any; -export const Poly: { polymorphicComponent: React.ComponentType<{ readonly p: [vehicle, any] }> } = HooksBS.Poly as any; +export const Poly: { polymorphicComponent: React.ComponentType<{ readonly p: [vehicle, any] }> } = HooksJS.Poly as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Hooks.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Hooks.res.js similarity index 97% rename from jscomp/gentype_tests/typescript-react-example/src/Hooks.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Hooks.res.js index 7749eea179..cd15d84f9d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Hooks.bs.js +++ b/jscomp/gentype_tests/typescript-react-example/src/Hooks.res.js @@ -2,8 +2,8 @@ import * as Curry from "rescript/lib/es6/curry.js"; import * as React from "react"; -import * as ImportHooks from "./ImportHooks.bs.js"; -import * as ImportHookDefault from "./ImportHookDefault.bs.js"; +import * as ImportHooks from "./ImportHooks.res.js"; +import * as ImportHookDefault from "./ImportHookDefault.res.js"; function Hooks(Props) { var vehicle = Props.vehicle; diff --git a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.bs.js b/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.bs.js b/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.bs.js b/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.bs.js b/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/ImportHooks.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/ImportHooks.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.bs.js b/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/ImportIndex.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/ImportIndex.res.js 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 3232541774..96acb5ab48 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx @@ -75,7 +75,7 @@ export const defaultTypeChecked: number = defaultNotChecked as any; // Export '$$default' early to allow circular import from the '.bs.js' file. export const $$default: unknown = defaultTypeChecked as number as any; -const ImportJsValueBS = require('./ImportJsValue.bs'); +const ImportJsValueJS = require('./ImportJsValue.res.js'); import type {AbsoluteValue as $$AbsoluteValue_t} from './MyMath'; @@ -109,14 +109,14 @@ export type myNum = $$myNum; export type polyType = $$polyType; -export const roundedNumber: number = ImportJsValueBS.roundedNumber as any; +export const roundedNumber: number = ImportJsValueJS.roundedNumber as any; -export const areaValue: number = ImportJsValueBS.areaValue as any; +export const areaValue: number = ImportJsValueJS.areaValue as any; -export const useGetProp: (x:AbsoluteValue_t) => number = ImportJsValueBS.useGetProp as any; +export const useGetProp: (x:AbsoluteValue_t) => number = ImportJsValueJS.useGetProp as any; -export const useGetAbs: (x:AbsoluteValue_t) => number = ImportJsValueBS.useGetAbs as any; +export const useGetAbs: (x:AbsoluteValue_t) => number = ImportJsValueJS.useGetAbs as any; -export const returnedFromHigherOrder: number = ImportJsValueBS.returnedFromHigherOrder as any; +export const returnedFromHigherOrder: number = ImportJsValueJS.returnedFromHigherOrder as any; export default $$default; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.bs.js b/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/Inherits.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Inherits.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Inherits.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Inherits.res.js 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 e5de8532fa..f5e9015cbe 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.gen.tsx @@ -3,10 +3,10 @@ /* eslint-disable */ /* tslint:disable */ -import * as InnerModuleSignatureBS from './InnerModuleSignature.bs'; +import * as InnerModuleSignatureJS from './InnerModuleSignature.res.js'; export type InnerModule_t = string; -export const InnerModule_make: (_1:InnerModule_t) => string = InnerModuleSignatureBS.InnerModule.make as any; +export const InnerModule_make: (_1:InnerModule_t) => string = InnerModuleSignatureJS.InnerModule.make as any; -export const InnerModule: { make: (_1:InnerModule_t) => string } = InnerModuleSignatureBS.InnerModule as any; +export const InnerModule: { make: (_1:InnerModule_t) => string } = InnerModuleSignatureJS.InnerModule as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.bs.js b/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/JSResource.bs.js b/jscomp/gentype_tests/typescript-react-example/src/JSResource.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/JSResource.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/JSResource.res.js 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 8d362cce39..1d627f900d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx @@ -23,7 +23,7 @@ export const make: unknown = makeTypeChecked as React.ComponentType<{ readonly renderMe: renderMe }> as any; -const JSXV4BS = require('./JSXV4.bs'); +const JSXV4JS = require('./JSXV4.res.js'); export type CompV4_props = { readonly x: x; readonly y: y }; @@ -38,12 +38,12 @@ export type props = { readonly renderMe: renderMe }; -export const CompV4_make: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4BS.CompV4.make as any; +export const CompV4_make: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4JS.CompV4.make as any; export type Props = { readonly x: string; readonly y: string }; -export const CompV3_make: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4BS.CompV3.make as any; +export const CompV3_make: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4JS.CompV3.make as any; -export const CompV3: { make: React.ComponentType<{ readonly x: string; readonly y: string }> } = JSXV4BS.CompV3 as any; +export const CompV3: { make: React.ComponentType<{ readonly x: string; readonly y: string }> } = JSXV4JS.CompV3 as any; -export const CompV4: { make: React.ComponentType<{ readonly x: string; readonly y: string }> } = JSXV4BS.CompV4 as any; +export const CompV4: { make: React.ComponentType<{ readonly x: string; readonly y: string }> } = JSXV4JS.CompV4 as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/JSXV4.bs.js b/jscomp/gentype_tests/typescript-react-example/src/JSXV4.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/JSXV4.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/JSXV4.res.js 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 9fd71b443e..dad8e55edb 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.gen.tsx @@ -3,6 +3,6 @@ /* eslint-disable */ /* tslint:disable */ -import * as LabeledFunBS from './LabeledFun.bs'; +import * as LabeledFunJS from './LabeledFun.res.js'; -export const labelled: (a:number, b:(undefined | number), c:number, _4:number, e:number, f:number) => number = LabeledFunBS.labelled as any; +export const labelled: (a:number, b:(undefined | number), c:number, _4:number, e:number, f:number) => number = LabeledFunJS.labelled as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.bs.js b/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/LabeledFun.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/LabeledFun.res.js 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 6c4afe1db1..4e8a975cbd 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.gen.tsx @@ -3,6 +3,6 @@ /* eslint-disable */ /* tslint:disable */ -import * as LetPrivateBS from './LetPrivate.bs'; +import * as LetPrivateJS from './LetPrivate.res.js'; -export const y: number = LetPrivateBS.y as any; +export const y: number = LetPrivateJS.y as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.bs.js b/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/LetPrivate.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/LetPrivate.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/Lib.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Lib.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Lib.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Lib.res.js 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 6f79cf642b..9f96470cc4 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Machine.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Machine.gen.tsx @@ -3,8 +3,8 @@ /* eslint-disable */ /* tslint:disable */ -import * as MachineBS from './Machine.bs'; +import * as MachineJS from './Machine.res.js'; export type aa = { TAG: "A"; _0: number }; -export const a: aa = MachineBS.a as any; +export const a: aa = MachineJS.a as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Machine.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Machine.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Machine.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Machine.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/Map_.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Map_.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Map_.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Map_.res.js 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 cc5d9d0817..6f6a95ed95 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as ModuleAliasesBS from './ModuleAliases.bs'; +import * as ModuleAliasesJS from './ModuleAliases.res.js'; export type Outer_Inner_innerT = { readonly inner: string }; @@ -19,8 +19,8 @@ export type Outer2Alias_Inner2_OuterInnerAlias2_innerT = Outer2_Inner2_OuterInne export type InnerNestedAlias_t = Outer2_Inner2_InnerNested_t; -export const testNested: (x:InnerNestedAlias_t) => InnerNestedAlias_t = ModuleAliasesBS.testNested as any; +export const testNested: (x:InnerNestedAlias_t) => InnerNestedAlias_t = ModuleAliasesJS.testNested as any; -export const testInner: (x:Outer2Alias_OuterInnerAlias_innerT) => Outer2Alias_OuterInnerAlias_innerT = ModuleAliasesBS.testInner as any; +export const testInner: (x:Outer2Alias_OuterInnerAlias_innerT) => Outer2Alias_OuterInnerAlias_innerT = ModuleAliasesJS.testInner as any; -export const testInner2: (x:Outer2Alias_Inner2_OuterInnerAlias2_innerT) => Outer2Alias_Inner2_OuterInnerAlias2_innerT = ModuleAliasesBS.testInner2 as any; +export const testInner2: (x:Outer2Alias_Inner2_OuterInnerAlias2_innerT) => Outer2Alias_Inner2_OuterInnerAlias2_innerT = ModuleAliasesJS.testInner2 as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.bs.js b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.bs.js b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.gen.tsx new file mode 100644 index 0000000000..3fe5123d7e --- /dev/null +++ b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.gen.tsx @@ -0,0 +1,6 @@ +/* TypeScript file generated from ModuleResolution1.res by genType. */ + +/* eslint-disable */ +/* tslint:disable */ + +export type t1 = { readonly foo: string; readonly bar: number }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.res b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.res new file mode 100644 index 0000000000..8bfad4e484 --- /dev/null +++ b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.res @@ -0,0 +1,5 @@ +@genType +type t1 = { + foo: string, + bar: int, +} diff --git a/jscomp/gentype_tests/typescript-react-example/src/Null.bs.js b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Null.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.gen.tsx new file mode 100644 index 0000000000..d9e793ef63 --- /dev/null +++ b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.gen.tsx @@ -0,0 +1,8 @@ +/* TypeScript file generated from ModuleResolution2.res by genType. */ + +/* eslint-disable */ +/* tslint:disable */ + +import type {t1 as ModuleResolution1_t1} from './ModuleResolution1.gen'; + +export type t2 = { readonly dependency: ModuleResolution1_t1 }; diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.res b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.res new file mode 100644 index 0000000000..5b29992f88 --- /dev/null +++ b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.res @@ -0,0 +1,2 @@ +@genType +type t2 = {dependency: ModuleResolution1.t1} diff --git a/jscomp/gentype_tests/typescript-react-example/src/Nullable.bs.js b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Nullable.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.res.js 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 d44fb3a9c4..9da02967f9 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.gen.tsx @@ -3,12 +3,12 @@ /* eslint-disable */ /* tslint:disable */ -import * as MoreVariantsBS from './MoreVariants.bs'; +import * as MoreVariantsJS from './MoreVariants.res.js'; export type withRenaming = "type_" | "b"; export type withoutRenaming = "type_" | "b"; -export const testWithRenaming: (x:withRenaming) => withRenaming = MoreVariantsBS.testWithRenaming as any; +export const testWithRenaming: (x:withRenaming) => withRenaming = MoreVariantsJS.testWithRenaming as any; -export const testWithoutRenaming: (x:withoutRenaming) => withoutRenaming = MoreVariantsBS.testWithoutRenaming as any; +export const testWithoutRenaming: (x:withoutRenaming) => withoutRenaming = MoreVariantsJS.testWithoutRenaming as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.bs.js b/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/MoreVariants.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/MoreVariants.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyInput.bs.js b/jscomp/gentype_tests/typescript-react-example/src/MyInput.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/MyInput.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/MyInput.res.js 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 b630402b95..37a3a3bf4a 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/MyModule.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/MyModule.gen.tsx @@ -3,8 +3,8 @@ /* eslint-disable */ /* tslint:disable */ -import * as MyModuleBS from './MyModule.bs'; +import * as MyModuleJS from './MyModule.res.js'; export type t = number; -export const add: (a:t, b:t) => t = MyModuleBS.add as any; +export const add: (a:t, b:t) => t = MyModuleJS.add as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyModule.bs.js b/jscomp/gentype_tests/typescript-react-example/src/MyModule.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/MyModule.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/MyModule.res.js 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 be1b8e354e..ad6d2fa301 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/NestedModules.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/NestedModules.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as NestedModulesBS from './NestedModules.bs'; +import * as NestedModulesJS from './NestedModules.res.js'; export type Universe_nestedType = string[]; @@ -13,19 +13,19 @@ export type Universe_Nested2_Nested3_nested3Type = Array>; export type Universe_variant = "A" | { TAG: "B"; _0: string }; -export const notNested: number = NestedModulesBS.notNested as any; +export const notNested: number = NestedModulesJS.notNested as any; -export const Universe_theAnswer: number = NestedModulesBS.Universe.theAnswer as any; +export const Universe_theAnswer: number = NestedModulesJS.Universe.theAnswer as any; -export const Universe_Nested2_nested2Value: number = NestedModulesBS.Universe.Nested2.nested2Value as any; +export const Universe_Nested2_nested2Value: number = NestedModulesJS.Universe.Nested2.nested2Value as any; -export const Universe_Nested2_Nested3_nested3Value: string = NestedModulesBS.Universe.Nested2.Nested3.nested3Value as any; +export const Universe_Nested2_Nested3_nested3Value: string = NestedModulesJS.Universe.Nested2.Nested3.nested3Value as any; -export const Universe_Nested2_Nested3_nested3Function: (x:Universe_Nested2_nested2Type) => Universe_Nested2_nested2Type = NestedModulesBS.Universe.Nested2.Nested3.nested3Function as any; +export const Universe_Nested2_Nested3_nested3Function: (x:Universe_Nested2_nested2Type) => Universe_Nested2_nested2Type = NestedModulesJS.Universe.Nested2.Nested3.nested3Function as any; -export const Universe_Nested2_nested2Function: (x:Universe_Nested2_Nested3_nested3Type) => Universe_Nested2_Nested3_nested3Type = NestedModulesBS.Universe.Nested2.nested2Function as any; +export const Universe_Nested2_nested2Function: (x:Universe_Nested2_Nested3_nested3Type) => Universe_Nested2_Nested3_nested3Type = NestedModulesJS.Universe.Nested2.nested2Function as any; -export const Universe_someString: string = NestedModulesBS.Universe.someString as any; +export const Universe_someString: string = NestedModulesJS.Universe.someString as any; export const Universe: { theAnswer: number; @@ -38,4 +38,4 @@ export const Universe: { } }; someString: string -} = NestedModulesBS.Universe as any; +} = NestedModulesJS.Universe as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedModules.bs.js b/jscomp/gentype_tests/typescript-react-example/src/NestedModules.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/NestedModules.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/NestedModules.res.js 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 a165e5c230..2e4577ba53 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.gen.tsx @@ -3,8 +3,8 @@ /* eslint-disable */ /* tslint:disable */ -import * as NestedModulesInSignatureBS from './NestedModulesInSignature.bs'; +import * as NestedModulesInSignatureJS from './NestedModulesInSignature.res.js'; -export const Universe_theAnswer: number = NestedModulesInSignatureBS.Universe.theAnswer as any; +export const Universe_theAnswer: number = NestedModulesInSignatureJS.Universe.theAnswer as any; -export const Universe: { theAnswer: number } = NestedModulesInSignatureBS.Universe as any; +export const Universe: { theAnswer: number } = NestedModulesInSignatureJS.Universe as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.bs.js b/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.res.js 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 3cb7178ff1..7775b7ea52 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as NestedVariantsBS from './NestedVariants.bs'; +import * as NestedVariantsJS from './NestedVariants.res.js'; export type typeL = { TAG: "NonUnary"; _0: number; _1: number }; @@ -43,28 +43,28 @@ export type inline = | { TAG: "J"; readonly i: number; readonly j: number } | { TAG: "K"; _0: number; _1: number }; -export const makeVariant: () => typeL = NestedVariantsBS.makeVariant as any; +export const makeVariant: () => typeL = NestedVariantsJS.makeVariant as any; -export const makeABC: () => typeA = NestedVariantsBS.makeABC as any; +export const makeABC: () => typeA = NestedVariantsJS.makeABC as any; -export const makeBC: () => typeB = NestedVariantsBS.makeBC as any; +export const makeBC: () => typeB = NestedVariantsJS.makeBC as any; -export const makeAC: () => typeA = NestedVariantsBS.makeAC as any; +export const makeAC: () => typeA = NestedVariantsJS.makeAC as any; -export const makeAD: () => typeA = NestedVariantsBS.makeAD as any; +export const makeAD: () => typeA = NestedVariantsJS.makeAD as any; -export const makeAE: () => typeA = NestedVariantsBS.makeAE as any; +export const makeAE: () => typeA = NestedVariantsJS.makeAE as any; -export const makeFD: () => typeF = NestedVariantsBS.makeFD as any; +export const makeFD: () => typeF = NestedVariantsJS.makeFD as any; -export const makeHD: () => typeH = NestedVariantsBS.makeHD as any; +export const makeHD: () => typeH = NestedVariantsJS.makeHD as any; -export const makeJ: () => typeJ = NestedVariantsBS.makeJ as any; +export const makeJ: () => typeJ = NestedVariantsJS.makeJ as any; -export const makeK: () => typeK = NestedVariantsBS.makeK as any; +export const makeK: () => typeK = NestedVariantsJS.makeK as any; -export const testBoxedBinary: (param:boxedBinary) => number = NestedVariantsBS.testBoxedBinary as any; +export const testBoxedBinary: (param:boxedBinary) => number = NestedVariantsJS.testBoxedBinary as any; -export const testUnboxedBinary: (param:unboxedBinary) => number = NestedVariantsBS.testUnboxedBinary as any; +export const testUnboxedBinary: (param:unboxedBinary) => number = NestedVariantsJS.testUnboxedBinary as any; -export const testInline: (x:inline) => inline = NestedVariantsBS.testInline as any; +export const testInline: (x:inline) => inline = NestedVariantsJS.testInline as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.bs.js b/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/NestedVariants.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/NestedVariants.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.bs.js b/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Null.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Null.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/Promise.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Nullable.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Promise.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Nullable.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/RegExp.bs.js b/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/RegExp.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/Object.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Object.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Object.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Object.res.js 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 fe5343890f..16b6cf3536 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/OnClick2.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/OnClick2.gen.tsx @@ -5,8 +5,8 @@ import * as React from 'react'; -import * as OnClick2BS from './OnClick2.bs'; +import * as OnClick2JS from './OnClick2.res.js'; export type Props = { readonly onClick: (_1:MouseEvent) => void }; -export const make: React.ComponentType<{ readonly onClick: (_1:MouseEvent) => void }> = OnClick2BS.make as any; +export const make: React.ComponentType<{ readonly onClick: (_1:MouseEvent) => void }> = OnClick2JS.make as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/OnClick2.bs.js b/jscomp/gentype_tests/typescript-react-example/src/OnClick2.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/OnClick2.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/OnClick2.res.js 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 7bfe0b574f..5b300724d5 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Opaque.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Opaque.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as OpaqueBS from './Opaque.bs'; +import * as OpaqueJS from './Opaque.res.js'; import type {business as Records_business} from './Records.gen'; @@ -11,6 +11,6 @@ export abstract class opaqueFromRecords { protected opaque!: any }; /* simulate export type pair = [opaqueFromRecords, opaqueFromRecords]; -export const noConversion: (x:opaqueFromRecords) => opaqueFromRecords = OpaqueBS.noConversion as any; +export const noConversion: (x:opaqueFromRecords) => opaqueFromRecords = OpaqueJS.noConversion as any; -export const testConvertNestedRecordFromOtherFile: (x:Records_business) => Records_business = OpaqueBS.testConvertNestedRecordFromOtherFile as any; +export const testConvertNestedRecordFromOtherFile: (x:Records_business) => Records_business = OpaqueJS.testConvertNestedRecordFromOtherFile as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Opaque.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Opaque.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Opaque.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Opaque.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/RequireCond.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Promise.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/RequireCond.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Promise.res.js 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 c2a53eea97..f605dc6ec0 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Records.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Records.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as RecordsBS from './Records.bs'; +import * as RecordsJS from './Records.res.js'; import type {list} from '../src/shims/RescriptPervasives.shim'; @@ -57,52 +57,52 @@ export type myRecBsAs = { readonly "1number": string }; -export const origin: coord = RecordsBS.origin as any; +export const origin: coord = RecordsJS.origin as any; -export const computeArea: (param:coord) => number = RecordsBS.computeArea as any; +export const computeArea: (param:coord) => number = RecordsJS.computeArea as any; -export const coord2d: (x:number, y:number) => coord = RecordsBS.coord2d as any; +export const coord2d: (x:number, y:number) => coord = RecordsJS.coord2d as any; -export const findAddress: (business:business) => list = RecordsBS.findAddress as any; +export const findAddress: (business:business) => list = RecordsJS.findAddress as any; -export const someBusiness: business = RecordsBS.someBusiness as any; +export const someBusiness: business = RecordsJS.someBusiness as any; -export const findAllAddresses: (businesses:business[]) => string[] = RecordsBS.findAllAddresses as any; +export const findAllAddresses: (businesses:business[]) => string[] = RecordsJS.findAllAddresses as any; -export const getPayload: (param:payload) => T1 = RecordsBS.getPayload as any; +export const getPayload: (param:payload) => T1 = RecordsJS.getPayload as any; -export const getPayloadRecord: (param:payload) => record = RecordsBS.getPayloadRecord as any; +export const getPayloadRecord: (param:payload) => record = RecordsJS.getPayloadRecord as any; -export const recordValue: record = RecordsBS.recordValue as any; +export const recordValue: record = RecordsJS.recordValue as any; -export const payloadValue: payload = RecordsBS.payloadValue as any; +export const payloadValue: payload = RecordsJS.payloadValue as any; -export const getPayloadRecordPlusOne: (param:payload) => record = RecordsBS.getPayloadRecordPlusOne as any; +export const getPayloadRecordPlusOne: (param:payload) => record = RecordsJS.getPayloadRecordPlusOne as any; -export const findAddress2: (business:business2) => list = RecordsBS.findAddress2 as any; +export const findAddress2: (business:business2) => list = RecordsJS.findAddress2 as any; -export const someBusiness2: business2 = RecordsBS.someBusiness2 as any; +export const someBusiness2: business2 = RecordsJS.someBusiness2 as any; export const computeArea3: (o:{ readonly x: number; readonly y: number; readonly z: (null | undefined | number) -}) => number = RecordsBS.computeArea3 as any; +}) => number = RecordsJS.computeArea3 as any; export const computeArea4: (o:{ readonly x: number; readonly y: number; readonly z?: number -}) => number = RecordsBS.computeArea4 as any; +}) => number = RecordsJS.computeArea4 as any; -export const testMyRec: (x:myRec) => string = RecordsBS.testMyRec as any; +export const testMyRec: (x:myRec) => string = RecordsJS.testMyRec as any; -export const testMyRec2: (x:myRec) => myRec = RecordsBS.testMyRec2 as any; +export const testMyRec2: (x:myRec) => myRec = RecordsJS.testMyRec2 as any; -export const testMyObj: (x:myObj) => string = RecordsBS.testMyObj as any; +export const testMyObj: (x:myObj) => string = RecordsJS.testMyObj as any; -export const testMyObj2: (x:myObj) => myObj = RecordsBS.testMyObj2 as any; +export const testMyObj2: (x:myObj) => myObj = RecordsJS.testMyObj2 as any; -export const testMyRecBsAs: (x:myRecBsAs) => string[] = RecordsBS.testMyRecBsAs as any; +export const testMyRecBsAs: (x:myRecBsAs) => string[] = RecordsJS.testMyRecBsAs as any; -export const testMyRecBsAs2: (x:myRecBsAs) => myRecBsAs = RecordsBS.testMyRecBsAs2 as any; +export const testMyRecBsAs2: (x:myRecBsAs) => myRecBsAs = RecordsJS.testMyRecBsAs2 as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Records.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Records.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Records.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Records.res.js 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 475fd3daa8..ff722ab93d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/References.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/References.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as ReferencesBS from './References.bs'; +import * as ReferencesJS from './References.res.js'; export abstract class R_t { protected opaque!: a }; /* simulate opaque types */ @@ -11,18 +11,18 @@ export type t = R_t; export type requiresConversion = { readonly x: number }; -export const create: (x:number) => { contents: number } = ReferencesBS.create as any; +export const create: (x:number) => { contents: number } = ReferencesJS.create as any; -export const access: (r:{ contents: number }) => number = ReferencesBS.access as any; +export const access: (r:{ contents: number }) => number = ReferencesJS.access as any; -export const update: (r:{ contents: number }) => void = ReferencesBS.update as any; +export const update: (r:{ contents: number }) => void = ReferencesJS.update as any; -export const get: (_1:R_t) => T1 = ReferencesBS.get as any; +export const get: (_1:R_t) => T1 = ReferencesJS.get as any; -export const make: (_1:T1) => R_t = ReferencesBS.make as any; +export const make: (_1:T1) => R_t = ReferencesJS.make as any; -export const set: (_1:R_t, _2:T1) => void = ReferencesBS.set as any; +export const set: (_1:R_t, _2:T1) => void = ReferencesJS.set as any; -export const destroysRefIdentity: (x:{ contents: requiresConversion }) => { contents: requiresConversion } = ReferencesBS.destroysRefIdentity as any; +export const destroysRefIdentity: (x:{ contents: requiresConversion }) => { contents: requiresConversion } = ReferencesJS.destroysRefIdentity as any; -export const preserveRefIdentity: (x:R_t) => R_t = ReferencesBS.preserveRefIdentity as any; +export const preserveRefIdentity: (x:R_t) => R_t = ReferencesJS.preserveRefIdentity as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/References.bs.js b/jscomp/gentype_tests/typescript-react-example/src/References.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/References.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/References.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/Set_.bs.js b/jscomp/gentype_tests/typescript-react-example/src/RegExp.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Set_.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/RegExp.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/Undefined.bs.js b/jscomp/gentype_tests/typescript-react-example/src/RequireCond.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Undefined.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/RequireCond.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Set_.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Set_.res.js 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 78b62556c3..4684ffd311 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Shadow.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Shadow.gen.tsx @@ -3,6 +3,6 @@ /* eslint-disable */ /* tslint:disable */ -import * as ShadowBS from './Shadow.bs'; +import * as ShadowJS from './Shadow.res.js'; -export const test: () => string = ShadowBS.test as any; +export const test: () => string = ShadowJS.test as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Shadow.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Shadow.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Shadow.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Shadow.res.js 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 ae9dd31119..c90395cacb 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.gen.tsx @@ -3,14 +3,14 @@ /* eslint-disable */ /* tslint:disable */ -import * as TestEmitInnerModulesBS from './TestEmitInnerModules.bs'; +import * as TestEmitInnerModulesJS from './TestEmitInnerModules.res.js'; -export const Inner_x: number = TestEmitInnerModulesBS.Inner.x as any; +export const Inner_x: number = TestEmitInnerModulesJS.Inner.x as any; -export const Inner_y: string = TestEmitInnerModulesBS.Inner.y as any; +export const Inner_y: string = TestEmitInnerModulesJS.Inner.y as any; -export const Outer_Medium_Inner_y: number = TestEmitInnerModulesBS.Outer.Medium.Inner.y as any; +export const Outer_Medium_Inner_y: number = TestEmitInnerModulesJS.Outer.Medium.Inner.y as any; -export const Inner: { x: number; y: string } = TestEmitInnerModulesBS.Inner as any; +export const Inner: { x: number; y: string } = TestEmitInnerModulesJS.Inner as any; -export const Outer: { Medium: { Inner: { y: number } } } = TestEmitInnerModulesBS.Outer as any; +export const Outer: { Medium: { Inner: { y: number } } } = TestEmitInnerModulesJS.Outer as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.bs.js b/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.res.js 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 83c3801e71..ee7c318a68 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as TestFirstClassModulesBS from './TestFirstClassModules.bs'; +import * as TestFirstClassModulesJS from './TestFirstClassModules.res.js'; import type {firstClassModule as FirstClassModulesInterface_firstClassModule} from './FirstClassModulesInterface.gen'; @@ -13,10 +13,10 @@ import type {record as FirstClassModulesInterface_record} from './FirstClassModu 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 as any; +export const convert: (x:FirstClassModules_firstClassModule) => FirstClassModules_firstClassModule = TestFirstClassModulesJS.convert as any; -export const convertInterface: (x:FirstClassModulesInterface_firstClassModule) => FirstClassModulesInterface_firstClassModule = TestFirstClassModulesBS.convertInterface as any; +export const convertInterface: (x:FirstClassModulesInterface_firstClassModule) => FirstClassModulesInterface_firstClassModule = TestFirstClassModulesJS.convertInterface as any; -export const convertRecord: (x:FirstClassModulesInterface_record) => FirstClassModulesInterface_record = TestFirstClassModulesBS.convertRecord as any; +export const convertRecord: (x:FirstClassModulesInterface_record) => FirstClassModulesInterface_record = TestFirstClassModulesJS.convertRecord as any; -export const convertFirstClassModuleWithTypeEquations: (x:{ readonly out: ((_1:T1) => T1); readonly Inner: { readonly inn: ((_1:T2) => T2) } }) => { readonly out: (_1:T1) => T1; readonly Inner: { readonly inn: (_1:T2) => T2 } } = TestFirstClassModulesBS.convertFirstClassModuleWithTypeEquations as any; +export const convertFirstClassModuleWithTypeEquations: (x:{ readonly out: ((_1:T1) => T1); readonly Inner: { readonly inn: ((_1:T2) => T2) } }) => { readonly out: (_1:T1) => T1; readonly Inner: { readonly inn: (_1:T2) => T2 } } = TestFirstClassModulesJS.convertFirstClassModuleWithTypeEquations as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.bs.js b/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.res.js 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 9a6f462ca6..9037ddbe33 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx @@ -3,6 +3,6 @@ /* eslint-disable */ /* tslint:disable */ -import * as TestImmutableArrayBS from './TestImmutableArray.bs'; +import * as TestImmutableArrayJS from './TestImmutableArray.res.js'; -export const testImmutableArrayGet: (arr:ReadonlyArray) => (undefined | T1) = TestImmutableArrayBS.testImmutableArrayGet as any; +export const testImmutableArrayGet: (arr:ReadonlyArray) => (undefined | T1) = TestImmutableArrayJS.testImmutableArrayGet as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.bs.js b/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.res.js similarity index 88% rename from jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.res.js index 21d5965ac1..4cba8d864a 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.bs.js +++ b/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.res.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE import * as Belt_Array from "rescript/lib/es6/belt_Array.js"; -import * as ImmutableArray from "./ImmutableArray.bs.js"; +import * as ImmutableArray from "./ImmutableArray.res.js"; function testImmutableArrayGet(arr) { return ImmutableArray.$$Array.get(arr, 3); 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 4202a2c22d..fa6bcf0133 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as TestModuleAliasesBS from './TestModuleAliases.bs'; +import * as TestModuleAliasesJS from './TestModuleAliases.res.js'; import type {InnerAlias_inner as ModuleAliases2_InnerAlias_inner} from './ModuleAliases2.gen'; @@ -29,10 +29,10 @@ export type inner1 = ModuleAliases2_InnerAlias_inner; export type inner2 = ModuleAliases2_Outer_Inner_inner; -export const testInner1: (x:inner1) => inner1 = TestModuleAliasesBS.testInner1 as any; +export const testInner1: (x:inner1) => inner1 = TestModuleAliasesJS.testInner1 as any; -export const testInner1Expanded: (x:ModuleAliases2_InnerAlias_inner) => ModuleAliases2_InnerAlias_inner = TestModuleAliasesBS.testInner1Expanded as any; +export const testInner1Expanded: (x:ModuleAliases2_InnerAlias_inner) => ModuleAliases2_InnerAlias_inner = TestModuleAliasesJS.testInner1Expanded as any; -export const testInner2: (x:inner2) => inner2 = TestModuleAliasesBS.testInner2 as any; +export const testInner2: (x:inner2) => inner2 = TestModuleAliasesJS.testInner2 as any; -export const testInner2Expanded: (x:ModuleAliases2_Outer_Inner_inner) => ModuleAliases2_Outer_Inner_inner = TestModuleAliasesBS.testInner2Expanded as any; +export const testInner2Expanded: (x:ModuleAliases2_Outer_Inner_inner) => ModuleAliases2_Outer_Inner_inner = TestModuleAliasesJS.testInner2Expanded as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.bs.js b/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.res.js 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 4860f22c26..04f5f47e9f 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as TestPromiseBS from './TestPromise.bs'; +import * as TestPromiseJS from './TestPromise.res.js'; export type promise = Promise; @@ -11,6 +11,6 @@ export type fromPayload = { readonly x: number; readonly s: string }; export type toPayload = { readonly result: string }; -export const convert: (_1:Promise) => Promise = TestPromiseBS.convert as any; +export const convert: (_1:Promise) => Promise = TestPromiseJS.convert as any; -export const barx: (x:(undefined | Promise<(undefined | string)>), _2:void) => boolean = TestPromiseBS.barx as any; +export const barx: (x:(undefined | Promise<(undefined | string)>), _2:void) => boolean = TestPromiseJS.barx as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestPromise.bs.js b/jscomp/gentype_tests/typescript-react-example/src/TestPromise.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/TestPromise.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/TestPromise.res.js 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 1f98d9482f..71698f9c87 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx @@ -3,12 +3,12 @@ /* eslint-disable */ /* tslint:disable */ -import * as TransitiveType1BS from './TransitiveType1.bs'; +import * as TransitiveType1JS from './TransitiveType1.res.js'; import type {t2Alias as TransitiveType2_t2Alias} from './TransitiveType2.gen'; import type {t2 as TransitiveType2_t2} from './TransitiveType2.gen'; -export const convert: (x:TransitiveType2_t2) => TransitiveType2_t2 = TransitiveType1BS.convert as any; +export const convert: (x:TransitiveType2_t2) => TransitiveType2_t2 = TransitiveType1JS.convert as any; -export const convertAlias: (x:TransitiveType2_t2Alias) => TransitiveType2_t2Alias = TransitiveType1BS.convertAlias as any; +export const convertAlias: (x:TransitiveType2_t2Alias) => TransitiveType2_t2Alias = TransitiveType1JS.convertAlias as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.bs.js b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.bs.js b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.res.js 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 0d23a24608..9fa08f9bdc 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.gen.tsx @@ -3,8 +3,8 @@ /* eslint-disable */ /* tslint:disable */ -import * as TransitiveType3BS from './TransitiveType3.bs'; +import * as TransitiveType3JS from './TransitiveType3.res.js'; export type t3 = { readonly i: number; readonly s: string }; -export const convertT3: (x:t3) => t3 = TransitiveType3BS.convertT3 as any; +export const convertT3: (x:t3) => t3 = TransitiveType3JS.convertT3 as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.bs.js b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.bs.js b/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.bs.js b/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/TypeParams1.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/TypeParams1.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.bs.js b/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/TypeParams2.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/TypeParams2.res.js 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 2664d224a0..25d8ac0cb5 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.gen.tsx @@ -3,12 +3,12 @@ /* eslint-disable */ /* tslint:disable */ -import * as TypeParams3BS from './TypeParams3.bs'; +import * as TypeParams3JS from './TypeParams3.res.js'; import type {items2 as TypeParams2_items2} from './TypeParams2.gen'; import type {items as TypeParams2_items} from './TypeParams2.gen'; -export const test: (x:TypeParams2_items) => TypeParams2_items = TypeParams3BS.test as any; +export const test: (x:TypeParams2_items) => TypeParams2_items = TypeParams3JS.test as any; -export const test2: (x:TypeParams2_items2) => TypeParams2_items2 = TypeParams3BS.test2 as any; +export const test2: (x:TypeParams2_items2) => TypeParams2_items2 = TypeParams3JS.test2 as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.bs.js b/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/TypeParams3.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/TypeParams3.res.js 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 318be6d9ee..43d5469d46 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Unboxed.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Unboxed.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as UnboxedBS from './Unboxed.bs'; +import * as UnboxedJS from './Unboxed.res.js'; export type v1 = number; @@ -17,12 +17,12 @@ export type t = number[] | number | ((_1:number) => number); export type tabIndex = "0" | "1" | 0; -export const testV1: (x:v1) => v1 = UnboxedBS.testV1 as any; +export const testV1: (x:v1) => v1 = UnboxedJS.testV1 as any; -export const r2Test: (x:r2) => r2 = UnboxedBS.r2Test as any; +export const r2Test: (x:r2) => r2 = UnboxedJS.r2Test as any; -export const a: tabIndex = UnboxedBS.a as any; +export const a: tabIndex = UnboxedJS.a as any; -export const b: tabIndex = UnboxedBS.b as any; +export const b: tabIndex = UnboxedJS.b as any; -export const zero: 0 = UnboxedBS.zero as any; +export const zero: 0 = UnboxedJS.zero as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Unboxed.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Unboxed.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Unboxed.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Unboxed.res.js 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 ae3991416a..c9df733f62 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Uncurried.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as UncurriedBS from './Uncurried.bs'; +import * as UncurriedJS from './Uncurried.res.js'; export type u0 = () => string; @@ -17,26 +17,26 @@ export type auth = { readonly login: () => string }; export type authU = { readonly loginU: () => string }; -export const uncurried0: () => string = UncurriedBS.uncurried0 as any; +export const uncurried0: () => string = UncurriedJS.uncurried0 as any; -export const uncurried1: (x:number) => string = UncurriedBS.uncurried1 as any; +export const uncurried1: (x:number) => string = UncurriedJS.uncurried1 as any; -export const uncurried2: (x:number, y:string) => string = UncurriedBS.uncurried2 as any; +export const uncurried2: (x:number, y:string) => string = UncurriedJS.uncurried2 as any; -export const uncurried3: (x:number, y:string, z:number) => string = UncurriedBS.uncurried3 as any; +export const uncurried3: (x:number, y:string, z:number) => string = UncurriedJS.uncurried3 as any; -export const curried3: (x:number, y:string, z:number) => string = UncurriedBS.curried3 as any; +export const curried3: (x:number, y:string, z:number) => string = UncurriedJS.curried3 as any; -export const callback: (cb:(() => number)) => string = UncurriedBS.callback as any; +export const callback: (cb:(() => number)) => string = UncurriedJS.callback as any; -export const callback2: (auth:auth) => string = UncurriedBS.callback2 as any; +export const callback2: (auth:auth) => string = UncurriedJS.callback2 as any; -export const callback2U: (auth:authU) => string = UncurriedBS.callback2U as any; +export const callback2U: (auth:authU) => string = UncurriedJS.callback2U as any; -export const sumU: (n:number, m:number) => void = UncurriedBS.sumU as any; +export const sumU: (n:number, m:number) => void = UncurriedJS.sumU as any; -export const sumU2: (n:number) => (_1:number) => void = UncurriedBS.sumU2 as any; +export const sumU2: (n:number) => (_1:number) => void = UncurriedJS.sumU2 as any; -export const sumCurried: (n:number, _2:number) => void = UncurriedBS.sumCurried as any; +export const sumCurried: (n:number, _2:number) => void = UncurriedJS.sumCurried as any; -export const sumLblCurried: (s:string, n:number, m:number) => void = UncurriedBS.sumLblCurried as any; +export const sumLblCurried: (s:string, n:number, m:number) => void = UncurriedJS.sumLblCurried as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Uncurried.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Uncurried.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Uncurried.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/WeakMap.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Undefined.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/WeakMap.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Undefined.res.js 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 fee1eadf8d..551e6df22a 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Usage.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Usage.gen.tsx @@ -3,8 +3,8 @@ /* eslint-disable */ /* tslint:disable */ -import * as UsageBS from './Usage.bs'; +import * as UsageJS from './Usage.res.js'; import type {MyModuleAlias_t as Wrapper_MyModuleAlias_t} from './Wrapper.gen'; -export const b: Wrapper_MyModuleAlias_t = UsageBS.b as any; +export const b: Wrapper_MyModuleAlias_t = UsageJS.b as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Usage.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Usage.res.js similarity index 74% rename from jscomp/gentype_tests/typescript-react-example/src/Usage.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Usage.res.js index 04b9d76c21..602ee55bcb 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Usage.bs.js +++ b/jscomp/gentype_tests/typescript-react-example/src/Usage.res.js @@ -1,6 +1,6 @@ // Generated by ReScript, PLEASE EDIT WITH CARE -import * as MyModule from "./MyModule.bs.js"; +import * as MyModule from "./MyModule.res.js"; var b = MyModule.add(5, 3); 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 f532c95c84..0fad6f2076 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.gen.tsx @@ -3,12 +3,12 @@ /* eslint-disable */ /* tslint:disable */ -import * as UseImportJsValueBS from './UseImportJsValue.bs'; +import * as UseImportJsValueJS from './UseImportJsValue.res.js'; import type {AbsoluteValue_t as ImportJsValue_AbsoluteValue_t} from './ImportJsValue.gen'; import type {stringFunction as ImportJsValue_stringFunction} from './ImportJsValue.gen'; -export const useGetProp: (x:ImportJsValue_AbsoluteValue_t) => number = UseImportJsValueBS.useGetProp as any; +export const useGetProp: (x:ImportJsValue_AbsoluteValue_t) => number = UseImportJsValueJS.useGetProp as any; -export const useTypeImportedInOtherModule: (x:ImportJsValue_stringFunction) => ImportJsValue_stringFunction = UseImportJsValueBS.useTypeImportedInOtherModule as any; +export const useTypeImportedInOtherModule: (x:ImportJsValue_stringFunction) => ImportJsValue_stringFunction = UseImportJsValueJS.useTypeImportedInOtherModule as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.bs.js b/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/WeakSet.bs.js b/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/WeakSet.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.res.js 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 81188b351c..3b2b65d60d 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as VariantsBS from './Variants.bs'; +import * as VariantsJS from './Variants.res.js'; import type {list} from '../src/shims/RescriptPervasives.shim'; @@ -45,40 +45,40 @@ export type result3 = { TAG: "Ok"; _0: a } | { TAG: "Error"; _0: b }; -export const isWeekend: (x:weekday) => boolean = VariantsBS.isWeekend as any; +export const isWeekend: (x:weekday) => boolean = VariantsJS.isWeekend as any; -export const monday: "monday" = VariantsBS.monday as any; +export const monday: "monday" = VariantsJS.monday as any; -export const saturday: "saturday" = VariantsBS.saturday as any; +export const saturday: "saturday" = VariantsJS.saturday as any; -export const sunday: "sunday" = VariantsBS.sunday as any; +export const sunday: "sunday" = VariantsJS.sunday as any; -export const onlySunday: (param:"sunday") => void = VariantsBS.onlySunday as any; +export const onlySunday: (param:"sunday") => void = VariantsJS.onlySunday as any; -export const swap: (x:"saturday" | "sunday") => "saturday" | "sunday" = VariantsBS.swap as any; +export const swap: (x:"saturday" | "sunday") => "saturday" | "sunday" = VariantsJS.swap as any; -export const testConvert: (x:testGenTypeAs) => testGenTypeAs = VariantsBS.testConvert as any; +export const testConvert: (x:testGenTypeAs) => testGenTypeAs = VariantsJS.testConvert as any; -export const fortytwoOK: testGenTypeAs = VariantsBS.fortytwoOK as any; +export const fortytwoOK: testGenTypeAs = VariantsJS.fortytwoOK as any; -export const fortytwoBAD: "fortytwo" = VariantsBS.fortytwoBAD as any; +export const fortytwoBAD: "fortytwo" = VariantsJS.fortytwoBAD as any; -export const testConvert2: (x:testGenTypeAs2) => testGenTypeAs2 = VariantsBS.testConvert2 as any; +export const testConvert2: (x:testGenTypeAs2) => testGenTypeAs2 = VariantsJS.testConvert2 as any; -export const testConvert3: (x:testGenTypeAs3) => testGenTypeAs3 = VariantsBS.testConvert3 as any; +export const testConvert3: (x:testGenTypeAs3) => testGenTypeAs3 = VariantsJS.testConvert3 as any; -export const testConvert2to3: (x:testGenTypeAs2) => testGenTypeAs3 = VariantsBS.testConvert2to3 as any; +export const testConvert2to3: (x:testGenTypeAs2) => testGenTypeAs3 = VariantsJS.testConvert2to3 as any; -export const id1: (x:x1) => x1 = VariantsBS.id1 as any; +export const id1: (x:x1) => x1 = VariantsJS.id1 as any; -export const id2: (x:x2) => x2 = VariantsBS.id2 as any; +export const id2: (x:x2) => x2 = VariantsJS.id2 as any; export const polyWithOpt: (foo:string) => (undefined | ( { NAME: "One"; VAL: string } - | { NAME: "Two"; VAL: number })) = VariantsBS.polyWithOpt as any; + | { NAME: "Two"; VAL: number })) = VariantsJS.polyWithOpt as any; -export const restResult1: (x:result1) => result1 = VariantsBS.restResult1 as any; +export const restResult1: (x:result1) => result1 = VariantsJS.restResult1 as any; -export const restResult2: (x:result2) => result2 = VariantsBS.restResult2 as any; +export const restResult2: (x:result2) => result2 = VariantsJS.restResult2 as any; -export const restResult3: (x:result3) => result3 = VariantsBS.restResult3 as any; +export const restResult3: (x:result3) => result3 = VariantsJS.restResult3 as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Variants.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Variants.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Variants.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Variants.res.js 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 df67a1ff8f..4cb3a20bac 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.gen.tsx @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as VariantsWithPayloadBS from './VariantsWithPayload.bs'; +import * as VariantsWithPayloadJS from './VariantsWithPayload.res.js'; export type payload = { readonly x: number; readonly y?: string }; @@ -33,20 +33,20 @@ export type variant1Int = { TAG: "R"; _0: number }; export type variant1Object = { TAG: "R"; _0: payload }; -export const testWithPayload: (x:withPayload) => withPayload = VariantsWithPayloadBS.testWithPayload as any; +export const testWithPayload: (x:withPayload) => withPayload = VariantsWithPayloadJS.testWithPayload as any; -export const printVariantWithPayload: (x:withPayload) => void = VariantsWithPayloadBS.printVariantWithPayload as any; +export const printVariantWithPayload: (x:withPayload) => void = VariantsWithPayloadJS.printVariantWithPayload as any; -export const testManyPayloads: (x:manyPayloads) => manyPayloads = VariantsWithPayloadBS.testManyPayloads as any; +export const testManyPayloads: (x:manyPayloads) => manyPayloads = VariantsWithPayloadJS.testManyPayloads as any; -export const printManyPayloads: (x:manyPayloads) => void = VariantsWithPayloadBS.printManyPayloads as any; +export const printManyPayloads: (x:manyPayloads) => void = VariantsWithPayloadJS.printManyPayloads as any; -export const testSimpleVariant: (x:simpleVariant) => simpleVariant = VariantsWithPayloadBS.testSimpleVariant as any; +export const testSimpleVariant: (x:simpleVariant) => simpleVariant = VariantsWithPayloadJS.testSimpleVariant as any; -export const testVariantWithPayloads: (x:variantWithPayloads) => variantWithPayloads = VariantsWithPayloadBS.testVariantWithPayloads as any; +export const testVariantWithPayloads: (x:variantWithPayloads) => variantWithPayloads = VariantsWithPayloadJS.testVariantWithPayloads as any; -export const printVariantWithPayloads: (x:variantWithPayloads) => void = VariantsWithPayloadBS.printVariantWithPayloads as any; +export const printVariantWithPayloads: (x:variantWithPayloads) => void = VariantsWithPayloadJS.printVariantWithPayloads as any; -export const testVariant1Int: (x:variant1Int) => variant1Int = VariantsWithPayloadBS.testVariant1Int as any; +export const testVariant1Int: (x:variant1Int) => variant1Int = VariantsWithPayloadJS.testVariant1Int as any; -export const testVariant1Object: (x:variant1Object) => variant1Object = VariantsWithPayloadBS.testVariant1Object as any; +export const testVariant1Object: (x:variant1Object) => variant1Object = VariantsWithPayloadJS.testVariant1Object as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.bs.js b/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.res.js 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 bd887b76b2..9fd5e1d214 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx @@ -3,6 +3,6 @@ /* eslint-disable */ /* tslint:disable */ -import * as WarningsBS from './Warnings.bs'; +import * as WarningsJS from './Warnings.res.js'; -export const ddd: number = WarningsBS.x as any; +export const ddd: number = WarningsJS.x as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Warnings.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Warnings.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Warnings.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Warnings.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/WeakMap.res.js b/jscomp/gentype_tests/typescript-react-example/src/WeakMap.res.js new file mode 100644 index 0000000000..d856702bfe --- /dev/null +++ b/jscomp/gentype_tests/typescript-react-example/src/WeakMap.res.js @@ -0,0 +1,2 @@ +// Generated by ReScript, PLEASE EDIT WITH CARE +/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */ diff --git a/jscomp/gentype_tests/typescript-react-example/src/WeakSet.res.js b/jscomp/gentype_tests/typescript-react-example/src/WeakSet.res.js new file mode 100644 index 0000000000..d856702bfe --- /dev/null +++ b/jscomp/gentype_tests/typescript-react-example/src/WeakSet.res.js @@ -0,0 +1,2 @@ +// Generated by ReScript, PLEASE EDIT WITH CARE +/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */ 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 f0aa556ab5..d2baeb44c7 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/Wrapper.gen.tsx @@ -3,10 +3,10 @@ /* eslint-disable */ /* tslint:disable */ -import * as WrapperBS from './Wrapper.bs'; +import * as WrapperJS from './Wrapper.res.js'; export type MyModuleAlias_t = number; -export const MyModuleAlias_add: (_1:MyModuleAlias_t, _2:MyModuleAlias_t) => MyModuleAlias_t = WrapperBS.MyModuleAlias.add as any; +export const MyModuleAlias_add: (_1:MyModuleAlias_t, _2:MyModuleAlias_t) => MyModuleAlias_t = WrapperJS.MyModuleAlias.add as any; -export const MyModuleAlias: { add: (_1:MyModuleAlias_t, _2:MyModuleAlias_t) => MyModuleAlias_t } = WrapperBS.MyModuleAlias as any; +export const MyModuleAlias: { add: (_1:MyModuleAlias_t, _2:MyModuleAlias_t) => MyModuleAlias_t } = WrapperJS.MyModuleAlias as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Wrapper.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/Wrapper.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/Wrapper.res.js 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 c24c41d1ff..835e5cb896 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/counter.gen.tsx +++ b/jscomp/gentype_tests/typescript-react-example/src/counter.gen.tsx @@ -3,8 +3,8 @@ /* eslint-disable */ /* tslint:disable */ -import * as counterBS from './counter.bs'; +import * as counterJS from './counter.res.js'; import type {aa as Machine_aa} from './Machine.gen'; -export const b: Machine_aa = counterBS.b as any; +export const b: Machine_aa = counterJS.b as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/counter.bs.js b/jscomp/gentype_tests/typescript-react-example/src/counter.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/counter.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/counter.res.js diff --git a/jscomp/gentype_tests/typescript-react-example/src/location/location.bs.js b/jscomp/gentype_tests/typescript-react-example/src/location/location.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/location/location.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/location/location.res.js 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 c437e35814..186aa8abc8 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 @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as TuplesBS from './Tuples.bs'; +import * as TuplesJS from './Tuples.res.js'; export type coord = [number, number, (undefined | number)]; @@ -13,20 +13,20 @@ export type person = { readonly name: string; readonly age: number }; export type couple = [person, person]; -export const testTuple: (param:[number, number]) => number = TuplesBS.testTuple as any; +export const testTuple: (param:[number, number]) => number = TuplesJS.testTuple as any; -export const origin: [number, number, (undefined | number)] = TuplesBS.origin as any; +export const origin: [number, number, (undefined | number)] = TuplesJS.origin as any; -export const computeArea: (param:[number, number, (undefined | number)]) => number = TuplesBS.computeArea as any; +export const computeArea: (param:[number, number, (undefined | number)]) => number = TuplesJS.computeArea as any; -export const computeAreaWithIdent: (param:coord) => number = TuplesBS.computeAreaWithIdent as any; +export const computeAreaWithIdent: (param:coord) => number = TuplesJS.computeAreaWithIdent as any; -export const computeAreaNoConverters: (param:[number, number]) => number = TuplesBS.computeAreaNoConverters as any; +export const computeAreaNoConverters: (param:[number, number]) => number = TuplesJS.computeAreaNoConverters as any; -export const coord2d: (x:T1, y:T2) => [T1, T2, (undefined | T3)] = TuplesBS.coord2d as any; +export const coord2d: (x:T1, y:T2) => [T1, T2, (undefined | T3)] = TuplesJS.coord2d as any; -export const getFirstName: (param:couple) => string = TuplesBS.getFirstName as any; +export const getFirstName: (param:couple) => string = TuplesJS.getFirstName as any; -export const marry: (first:person, second:person) => couple = TuplesBS.marry as any; +export const marry: (first:person, second:person) => couple = TuplesJS.marry as any; -export const changeSecondAge: (param:couple) => couple = TuplesBS.changeSecondAge as any; +export const changeSecondAge: (param:couple) => couple = TuplesJS.changeSecondAge as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.bs.js b/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.res.js 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 9a6fb1fc4e..f31439c426 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 @@ -3,7 +3,7 @@ /* eslint-disable */ /* tslint:disable */ -import * as TypesBS from './Types.bs'; +import * as TypesJS from './Types.res.js'; import type {Json_t as Js_Json_t} from '../../src/shims/Js.shim'; @@ -82,38 +82,38 @@ export type ObjectId_t = number; export type tPrimed = [TypeNameSanitize_t_, TypeNameSanitize_M_t__]; -export const someIntList: list = TypesBS.someIntList as any; +export const someIntList: list = TypesJS.someIntList as any; -export const map: (_1:((_1:T1) => T2), _2:list) => list = TypesBS.map as any; +export const map: (_1:((_1:T1) => T2), _2:list) => list = TypesJS.map as any; -export const swap: (tree:tree) => tree = TypesBS.swap as any; +export const swap: (tree:tree) => tree = TypesJS.swap as any; -export const selfRecursiveConverter: (param:selfRecursive) => selfRecursive = TypesBS.selfRecursiveConverter as any; +export const selfRecursiveConverter: (param:selfRecursive) => selfRecursive = TypesJS.selfRecursiveConverter as any; -export const mutuallyRecursiveConverter: (param:mutuallyRecursiveA) => mutuallyRecursiveB = TypesBS.mutuallyRecursiveConverter as any; +export const mutuallyRecursiveConverter: (param:mutuallyRecursiveA) => mutuallyRecursiveB = TypesJS.mutuallyRecursiveConverter as any; -export const testFunctionOnOptionsAsArgument: (a:(undefined | a), foo:((_1:(undefined | a)) => T1)) => T1 = TypesBS.testFunctionOnOptionsAsArgument as any; +export const testFunctionOnOptionsAsArgument: (a:(undefined | a), foo:((_1:(undefined | a)) => T1)) => T1 = TypesJS.testFunctionOnOptionsAsArgument as any; -export const stringT: string = TypesBS.stringT as any; +export const stringT: string = TypesJS.stringT as any; -export const jsStringT: string = TypesBS.jsStringT as any; +export const jsStringT: string = TypesJS.jsStringT as any; -export const jsString2T: string = TypesBS.jsString2T as any; +export const jsString2T: string = TypesJS.jsString2T as any; -export const jsonStringify: (_1:Js_Json_t) => string = TypesBS.jsonStringify as any; +export const jsonStringify: (_1:Js_Json_t) => string = TypesJS.jsonStringify as any; -export const testConvertNull: (x:(null | record)) => (null | record) = TypesBS.testConvertNull as any; +export const testConvertNull: (x:(null | record)) => (null | record) = TypesJS.testConvertNull as any; -export const testConvertLocation: (x:Location_t) => Location_t = TypesBS.testConvertLocation as any; +export const testConvertLocation: (x:Location_t) => Location_t = TypesJS.testConvertLocation as any; -export const testMarshalFields: marshalFields = TypesBS.testMarshalFields as any; +export const testMarshalFields: marshalFields = TypesJS.testMarshalFields as any; -export const setMatch: (x:marshalMutableField) => void = TypesBS.setMatch as any; +export const setMatch: (x:marshalMutableField) => void = TypesJS.setMatch as any; -export const testInstantiateTypeParameter: (x:instantiateTypeParameter) => instantiateTypeParameter = TypesBS.testInstantiateTypeParameter as any; +export const testInstantiateTypeParameter: (x:instantiateTypeParameter) => instantiateTypeParameter = TypesJS.testInstantiateTypeParameter as any; -export const currentTime: Date = TypesBS.currentTime as any; +export const currentTime: Date = TypesJS.currentTime as any; -export const i64Const: i64B = TypesBS.i64Const as any; +export const i64Const: i64B = TypesJS.i64Const as any; -export const optFunction: (undefined | (() => number)) = TypesBS.optFunction as any; +export const optFunction: (undefined | (() => number)) = TypesJS.optFunction as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/nested/Types.bs.js b/jscomp/gentype_tests/typescript-react-example/src/nested/Types.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/nested/Types.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/nested/Types.res.js 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 293b047362..71445c1822 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 @@ -3,6 +3,6 @@ /* eslint-disable */ /* tslint:disable */ -import * as _404BS from './404.bs'; +import * as _404JS from './404.res.js'; -export const x: number = _404BS.x as any; +export const x: number = _404JS.x as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.bs.js b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.res.js 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 cccbece998..2da19d83e4 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 @@ -3,6 +3,6 @@ /* eslint-disable */ /* tslint:disable */ -import * as AppModal_webBS from './AppModal.web.bs'; +import * as AppModal_webJS from './AppModal.web.res.js'; -export const x: number = AppModal_webBS.x as any; +export const x: number = AppModal_webJS.x as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.bs.js b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.res.js 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 9165c9ed9c..334ed855f2 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 @@ -3,6 +3,6 @@ /* eslint-disable */ /* tslint:disable */ -import * as _underBS from './_under.bs'; +import * as _underJS from './_under.res.js'; -export const x: number = _underBS.x as any; +export const x: number = _underJS.x as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.bs.js b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.res.js 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 8c34f1eda8..f56f140e08 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 @@ -3,6 +3,6 @@ /* eslint-disable */ /* tslint:disable */ -import * as with_underscoreBS from './with_underscore.bs'; +import * as with_underscoreJS from './with_underscore.res.js'; -export const x: number = with_underscoreBS.x as any; +export const x: number = with_underscoreJS.x as any; diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.bs.js b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.res.js similarity index 100% rename from jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.bs.js rename to jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.res.js