azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All tasks related to typescript generation made configuration avoidance compatible

Browse Source 
^KTI-1471 fixed
This commit is contained in:
Ilya Goncharov
2023-11-14 16:53:23 +00:00
committed by Space Team
parent e43b232786
commit 11b7c35eab
26 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/build.gradle.kts
+20 -14
View File
@@ -119,31 +119,37 @@ abstract class MochaTestTask : NpmTask(), VerificationTask
val testDataDir = project(":js:js.translator").projectDir.resolve("testData") val testDataDir = project(":js:js.translator").projectDir.resolve("testData")
val typescriptTestsDir = testDataDir.resolve("typescript-export") val typescriptTestsDir = testDataDir.resolve("typescript-export")
val installTsDependencies = task<NpmTask>("installTsDependencies") { val installTsDependencies by task<NpmTask> {
val packageLockFile = testDataDir.resolve("package-lock.json") val packageLockFile = testDataDir.resolve("package-lock.json")
inputs.file(testDataDir.resolve("package.json")) inputs.file(testDataDir.resolve("package.json"))
outputs.file(packageLockFile) outputs.file(packageLockFile)
outputs.upToDateWhen { packageLockFile.exists() } outputs.upToDateWhen { testDataDir.resolve("node_modules").exists() }
workingDir.set(testDataDir) workingDir.set(testDataDir)
args.set(listOf("install")) args.set(listOf("install"))
} }
fun parallel(tasksToRun: List<Task>, beforeAll: Task? = null, afterAll: Task? = null) = tasks.registering { fun parallel(tasksToRun: List<TaskProvider<*>>, beforeAll: TaskProvider<*>? = null, afterAll: TaskProvider<*>? = null): RegisteringDomainObjectDelegateProviderWithAction<out TaskContainer, Task> {
tasksToRun.forEach { dependsOn(it) } return tasks.registering {
tasksToRun.forEach { dependsOn(it) }
if (beforeAll != null) { if (afterAll != null) {
tasksToRun.forEach { it.dependsOn(beforeAll) } finalizedBy(afterAll)
} }
}.apply {
if (afterAll != null) { if (beforeAll != null) {
finalizedBy(afterAll) tasksToRun.forEach {
it.configure {
dependsOn(beforeAll)
}
}
}
} }
} }
val exportFileDirPostfix = "-in-exported-file" val exportFileDirPostfix = "-in-exported-file"
fun generateJsExportOnFileTestFor(dir: String): Task = task<Copy>("generate-js-export-on-file-for-$dir") { fun generateJsExportOnFileTestFor(dir: String): TaskProvider<Copy> = tasks.register<Copy>("generate-js-export-on-file-for-$dir") {
val dirPostfix = exportFileDirPostfix val dirPostfix = exportFileDirPostfix
val inputDir = fileTree(typescriptTestsDir.resolve(dir)) val inputDir = fileTree(typescriptTestsDir.resolve(dir))
val outputDir = typescriptTestsDir.resolve("$dir$dirPostfix") val outputDir = typescriptTestsDir.resolve("$dir$dirPostfix")
@@ -166,7 +172,7 @@ fun generateJsExportOnFileTestFor(dir: String): Task = task<Copy>("generate-js-e
filter { filter {
when { when {
isFirstLine && name.endsWith(".kt") -> "/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */\n\n$it" isFirstLine && name.endsWith(".kt") -> "/** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */\n\n$it"
.also { isFirstLine = false } .also { isFirstLine = false }
it.contains("// FILE") -> "$it\n\n@file:JsExport" it.contains("// FILE") -> "$it\n\n@file:JsExport"
@@ -184,9 +190,9 @@ fun generateJsExportOnFileTestFor(dir: String): Task = task<Copy>("generate-js-e
into(outputDir) into(outputDir)
} }
fun generateTypeScriptTestFor(dir: String): Task = task<NpmTask>("generate-ts-for-$dir") { fun generateTypeScriptTestFor(dir: String): TaskProvider<NpmTask> = tasks.register<NpmTask>("generate-ts-for-$dir") {
val baseDir = typescriptTestsDir.resolve(dir) val baseDir = typescriptTestsDir.resolve(dir)
val mainTsFile = fileTree(baseDir).files.find { it.name.endsWith("__main.ts") } ?: return@task val mainTsFile = fileTree(baseDir).files.find { it.name.endsWith("__main.ts") } ?: return@register
val mainJsFile = baseDir.resolve("${mainTsFile.nameWithoutExtension}.js") val mainJsFile = baseDir.resolve("${mainTsFile.nameWithoutExtension}.js")
workingDir.set(testDataDir) workingDir.set(testDataDir)
js/js.translator/testData/typescript-export/abstract-classes-in-exported-file/abstract-classes.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/constructors-in-exported-file/constructors.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// TARGET_BACKEND: JS_IR // TARGET_BACKEND: JS_IR
// IGNORE_BACKEND: JS_IR_ES6 // IGNORE_BACKEND: JS_IR_ES6
js/js.translator/testData/typescript-export/data-classes-in-exported-file/data-classes.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/deprecated-in-exported-file/deprecated.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/enum-classes-in-exported-file/enum-classes.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/escaped-declarations-in-exported-file/escaped-declarations.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/excluded-exported-declarations-in-exported-file/excluded-exported-declarations.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/functions-in-exported-file/functions.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/inner-classes-in-exported-file/inner-class.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/interfaces-in-exported-file/interfaces.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/js-name-in-exported-file/js-name.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/member-properties-in-exported-file/member-properties.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/methods-in-exported-file/methods.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/module-systems-in-exported-file/commonjs.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// SKIP_MINIFICATION // SKIP_MINIFICATION
js/js.translator/testData/typescript-export/module-systems-in-exported-file/esm.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// SKIP_MINIFICATION // SKIP_MINIFICATION
js/js.translator/testData/typescript-export/module-systems-in-exported-file/plain.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// SKIP_MINIFICATION // SKIP_MINIFICATION
js/js.translator/testData/typescript-export/module-systems-in-exported-file/umd.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// SKIP_MINIFICATION // SKIP_MINIFICATION
js/js.translator/testData/typescript-export/namespaces-in-exported-file/namespaces.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/not-exported-declarations-in-exported-file/not-exported-declarations.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/objects-in-exported-file/objects.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/primitives-in-exported-file/primitives.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/properties-in-exported-file/properties.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/regular-classes-in-exported-file/regular-classes.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/sealed-classes-in-exported-file/sealed-classes.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION
js/js.translator/testData/typescript-export/visibility-in-exported-file/visibility.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/** This file is generated by {@link :js:js.test:generateJsExportOnFileTestFilesForTS} task. DO NOT MODIFY MANUALLY */ /** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
// CHECK_TYPESCRIPT_DECLARATIONS // CHECK_TYPESCRIPT_DECLARATIONS
// RUN_PLAIN_BOX_FUNCTION // RUN_PLAIN_BOX_FUNCTION