output

millotp · millotp · commit 9aa1672c56e9 · 2024-09-26T15:07:37.000+02:00
diff --git a/generators/src/main/java/com/algolia/codegen/cts/AlgoliaCTSGenerator.java b/generators/src/main/java/com/algolia/codegen/cts/AlgoliaCTSGenerator.java
@@ -64,10 +64,12 @@ public void processOpts() {
       testsGenerators.add(new TestsClient(ctsManager, true));
       testsGenerators.add(new TestsClient(ctsManager, false));
     } else if (mode.equals("snippets")) {
-      ctsManager.addSnippetsSupportingFiles(supportingFiles);
+      ctsManager.addSnippetsSupportingFiles(supportingFiles, mode);
 
       testsGenerators.add(new SnippetsGenerator(ctsManager));
     } else if (mode.equals("guides")) {
+      ctsManager.addSnippetsSupportingFiles(supportingFiles, mode);
+
       testsGenerators.add(new GuidesGenerator(ctsManager));
     } else {
       throw new RuntimeException("Unknown mode: " + mode);
diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/CSharpCTSManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/CSharpCTSManager.java
@@ -27,12 +27,12 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {
   }
 
   @Override
-  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {
-    supportingFiles.add(new SupportingFile("snippets/src.csproj.mustache", "snippets/csharp/src/src.csproj"));
-    supportingFiles.add(new SupportingFile("snippets/Program.mustache", "snippets/csharp/src/Program.cs"));
-    supportingFiles.add(new SupportingFile("snippets/.gitignore.mustache", "snippets/csharp/.gitignore"));
-    supportingFiles.add(new SupportingFile("snippets/Algolia.mustache", "snippets/csharp/Algolia.sln"));
-    supportingFiles.add(new SupportingFile("snippets/dotnet-tools.mustache", "snippets/csharp/.config/dotnet-tools.json"));
+  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
+    supportingFiles.add(new SupportingFile("snippets/src.csproj.mustache", output + "/csharp/src/src.csproj"));
+    supportingFiles.add(new SupportingFile("snippets/Program.mustache", output + "/csharp/src/Program.cs"));
+    supportingFiles.add(new SupportingFile("snippets/.gitignore.mustache", output + "/csharp/.gitignore"));
+    supportingFiles.add(new SupportingFile("snippets/Algolia.mustache", output + "/csharp/Algolia.sln"));
+    supportingFiles.add(new SupportingFile("snippets/dotnet-tools.mustache", output + "/csharp/.config/dotnet-tools.json"));
   }
 
   @Override
diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/CTSManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/CTSManager.java
@@ -31,7 +31,7 @@ public default void addTestsSupportingFiles(List<SupportingFile> supportingFiles
     // NO-OP
   }
 
-  public default void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {
+  public default void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
     // NO-OP
   }
 
diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/DartCTSManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/DartCTSManager.java
@@ -38,10 +38,10 @@ public void addDataToBundle(Map<String, Object> bundle) throws GeneratorExceptio
   }
 
   @Override
-  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {
-    supportingFiles.add(new SupportingFile("snippets/.gitignore.mustache", "snippets/dart/.gitignore"));
-    supportingFiles.add(new SupportingFile("snippets/analysis_options.mustache", "snippets/dart/analysis_options.yaml"));
-    supportingFiles.add(new SupportingFile("snippets/pubspec.mustache", "snippets/dart/pubspec.yaml"));
-    supportingFiles.add(new SupportingFile("snippets/pubspec_overrides.mustache", "snippets/dart/pubspec_overrides.yaml"));
+  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
+    supportingFiles.add(new SupportingFile("snippets/.gitignore.mustache", output + "/dart/.gitignore"));
+    supportingFiles.add(new SupportingFile("snippets/analysis_options.mustache", output + "/dart/analysis_options.yaml"));
+    supportingFiles.add(new SupportingFile("snippets/pubspec.mustache", output + "/dart/pubspec.yaml"));
+    supportingFiles.add(new SupportingFile("snippets/pubspec_overrides.mustache", output + "/dart/pubspec_overrides.yaml"));
   }
 }
diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/GoCTSManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/GoCTSManager.java
@@ -34,9 +34,9 @@ public void addDataToBundle(Map<String, Object> bundle) throws GeneratorExceptio
   }
 
   @Override
-  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {
-    supportingFiles.add(new SupportingFile("snippets/.golangci.mustache", "snippets/go/.golangci.yml"));
-    supportingFiles.add(new SupportingFile("snippets/go.mod.mustache", "snippets/go/go.mod"));
-    supportingFiles.add(new SupportingFile("snippets/go.sum.mustache", "snippets/go/go.sum"));
+  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
+    supportingFiles.add(new SupportingFile("snippets/.golangci.mustache", output + "/go/.golangci.yml"));
+    supportingFiles.add(new SupportingFile("snippets/go.mod.mustache", output + "/go/go.mod"));
+    supportingFiles.add(new SupportingFile("snippets/go.sum.mustache", output + "/go/go.sum"));
   }
 }
diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/JavaCTSManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/JavaCTSManager.java
@@ -37,9 +37,9 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {
   }
 
   @Override
-  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {
-    supportingFiles.add(new SupportingFile("tests/build.mustache", "snippets/java", "build.gradle"));
-    supportingFiles.add(new SupportingFile("snippets/settings.mustache", "snippets/java", "settings.gradle"));
+  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
+    supportingFiles.add(new SupportingFile("tests/build.mustache", output + "/java", "build.gradle"));
+    supportingFiles.add(new SupportingFile("snippets/settings.mustache", output + "/java", "settings.gradle"));
   }
 
   @Override
diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/JavascriptCTSManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/JavascriptCTSManager.java
@@ -37,10 +37,10 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {
   }
 
   @Override
-  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {
-    supportingFiles.add(new SupportingFile("snippets/package.mustache", "snippets/javascript", "package.json"));
-    supportingFiles.add(new SupportingFile("snippets/tsconfig.mustache", "snippets/javascript", "tsconfig.json"));
-    supportingFiles.add(new SupportingFile("snippets/.yarnrc.mustache", "snippets/javascript", ".yarnrc.yml"));
+  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
+    supportingFiles.add(new SupportingFile("snippets/package.mustache", output + "/javascript", "package.json"));
+    supportingFiles.add(new SupportingFile("snippets/tsconfig.mustache", output + "/javascript", "tsconfig.json"));
+    supportingFiles.add(new SupportingFile("snippets/.yarnrc.mustache", output + "/javascript", ".yarnrc.yml"));
   }
 
   @Override
diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/KotlinCTSManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/KotlinCTSManager.java
@@ -23,11 +23,11 @@ public String getClient() {
   }
 
   @Override
-  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {
-    supportingFiles.add(new SupportingFile("snippets/build.gradle.mustache", "snippets/kotlin", "build.gradle.kts"));
-    supportingFiles.add(new SupportingFile("snippets/gradle.mustache", "snippets/kotlin", "gradle.properties"));
-    supportingFiles.add(new SupportingFile("snippets/libs.versions.mustache", "snippets/kotlin", "gradle/libs.versions.toml"));
-    supportingFiles.add(new SupportingFile("snippets/settings.gradle.mustache", "snippets/kotlin", "settings.gradle.kts"));
+  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
+    supportingFiles.add(new SupportingFile("snippets/build.gradle.mustache", output + "/kotlin", "build.gradle.kts"));
+    supportingFiles.add(new SupportingFile("snippets/gradle.mustache", output + "/kotlin", "gradle.properties"));
+    supportingFiles.add(new SupportingFile("snippets/libs.versions.mustache", output + "/kotlin", "gradle/libs.versions.toml"));
+    supportingFiles.add(new SupportingFile("snippets/settings.gradle.mustache", output + "/kotlin", "settings.gradle.kts"));
   }
 
   @Override
diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/PythonCTSManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/PythonCTSManager.java
@@ -31,8 +31,8 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {
   }
 
   @Override
-  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {
-    supportingFiles.add(new SupportingFile("snippets/pyproject.mustache", "snippets/python", "pyproject.toml"));
+  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
+    supportingFiles.add(new SupportingFile("snippets/pyproject.mustache", output + "/python", "pyproject.toml"));
   }
 
   @Override
diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/RubyCTSManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/RubyCTSManager.java
@@ -28,7 +28,7 @@ public void addDataToBundle(Map<String, Object> bundle) throws GeneratorExceptio
   }
 
   @Override
-  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {
-    supportingFiles.add(new SupportingFile("snippets/Gemfile.mustache", "snippets/ruby", "Gemfile"));
+  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
+    supportingFiles.add(new SupportingFile("snippets/Gemfile.mustache", output + "/ruby", "Gemfile"));
   }
 }
diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/ScalaCTSManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/ScalaCTSManager.java
@@ -28,11 +28,11 @@ public void addDataToBundle(Map<String, Object> bundle) throws GeneratorExceptio
   }
 
   @Override
-  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {
-    supportingFiles.add(new SupportingFile("snippets/.gitignore.mustache", "snippets/scala", ".gitignore"));
-    supportingFiles.add(new SupportingFile("snippets/.scalafmt.mustache", "snippets/scala", ".scalafmt.conf"));
-    supportingFiles.add(new SupportingFile("snippets/build.mustache", "snippets/scala", "build.sbt"));
-    supportingFiles.add(new SupportingFile("snippets/build.properties.mustache", "snippets/scala", "project/build.properties"));
-    supportingFiles.add(new SupportingFile("snippets/plugins.mustache", "snippets/scala", "project/plugins.sbt"));
+  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
+    supportingFiles.add(new SupportingFile("snippets/.gitignore.mustache", output + "/scala", ".gitignore"));
+    supportingFiles.add(new SupportingFile("snippets/.scalafmt.mustache", output + "/scala", ".scalafmt.conf"));
+    supportingFiles.add(new SupportingFile("snippets/build.mustache", output + "/scala", "build.sbt"));
+    supportingFiles.add(new SupportingFile("snippets/build.properties.mustache", output + "/scala", "project/build.properties"));
+    supportingFiles.add(new SupportingFile("snippets/plugins.mustache", output + "/scala", "project/plugins.sbt"));
   }
 }
diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/SwiftCTSManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/SwiftCTSManager.java
@@ -41,9 +41,9 @@ public void addDataToBundle(Map<String, Object> bundle) throws GeneratorExceptio
   }
 
   @Override
-  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {
-    supportingFiles.add(new SupportingFile("snippets/Package.mustache", "snippets/swift", "Package.swift"));
-    supportingFiles.add(new SupportingFile("snippets/.swiftformat.mustache", "snippets/swift", ".siwftformat"));
-    supportingFiles.add(new SupportingFile("snippets/.gitignore.mustache", "snippets/swift", ".gitignore"));
+  public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
+    supportingFiles.add(new SupportingFile("snippets/Package.mustache", output + "/swift", "Package.swift"));
+    supportingFiles.add(new SupportingFile("snippets/.swiftformat.mustache", output + "/swift", ".siwftformat"));
+    supportingFiles.add(new SupportingFile("snippets/.gitignore.mustache", output + "/swift", ".gitignore"));
   }
 }
diff --git a/scripts/buildClients.ts b/scripts/buildClients.ts
@@ -31,6 +31,8 @@ async function buildLanguage(language: Language, gens: Generator[], buildType: B
           packageName === 'algoliasearch' ? packageName : `@algolia/${packageName}`,
         );
         await run(`yarn build:many '{${packageNames.join(',')},}'`, { cwd, language });
+      } else {
+        await run('yarn tsc --noEmit', { cwd, language });
       }
 
       break;
diff --git a/scripts/install.sh b/scripts/install.sh
@@ -78,7 +78,7 @@ _apic_build_specs_complete() {
 
 _apic_build_complete() {
   if [[ COMP_CWORD -eq 2 ]]; then
-    COMPREPLY=($(compgen -W "clients playground snippets specs" -- "$cur"))
+    COMPREPLY=($(compgen -W "clients playground snippets guides specs" -- "$cur"))
   else
     second="${COMP_WORDS[2]}"
     if [[ $second == "clients" ]]; then

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public default void addTestsSupportingFiles(List<SupportingFile> supportingFiles`
`31`	`31`	`// NO-OP`
`32`	`32`	`}`
`33`	`33`
`34`		`- public default void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {`
	`34`	`+ public default void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {`
`35`	`35`	`// NO-OP`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,10 @@ public void addDataToBundle(Map<String, Object> bundle) throws GeneratorExceptio`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
`41`		`- public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {`
`42`		`- supportingFiles.add(new SupportingFile("snippets/.gitignore.mustache", "snippets/dart/.gitignore"));`
`43`		`- supportingFiles.add(new SupportingFile("snippets/analysis_options.mustache", "snippets/dart/analysis_options.yaml"));`
`44`		`- supportingFiles.add(new SupportingFile("snippets/pubspec.mustache", "snippets/dart/pubspec.yaml"));`
`45`		`- supportingFiles.add(new SupportingFile("snippets/pubspec_overrides.mustache", "snippets/dart/pubspec_overrides.yaml"));`
	`41`	`+ public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {`
	`42`	`+ supportingFiles.add(new SupportingFile("snippets/.gitignore.mustache", output + "/dart/.gitignore"));`
	`43`	`+ supportingFiles.add(new SupportingFile("snippets/analysis_options.mustache", output + "/dart/analysis_options.yaml"));`
	`44`	`+ supportingFiles.add(new SupportingFile("snippets/pubspec.mustache", output + "/dart/pubspec.yaml"));`
	`45`	`+ supportingFiles.add(new SupportingFile("snippets/pubspec_overrides.mustache", output + "/dart/pubspec_overrides.yaml"));`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,9 @@ public void addDataToBundle(Map<String, Object> bundle) throws GeneratorExceptio`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
`37`		`- public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {`
`38`		`- supportingFiles.add(new SupportingFile("snippets/.golangci.mustache", "snippets/go/.golangci.yml"));`
`39`		`- supportingFiles.add(new SupportingFile("snippets/go.mod.mustache", "snippets/go/go.mod"));`
`40`		`- supportingFiles.add(new SupportingFile("snippets/go.sum.mustache", "snippets/go/go.sum"));`
	`37`	`+ public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {`
	`38`	`+ supportingFiles.add(new SupportingFile("snippets/.golangci.mustache", output + "/go/.golangci.yml"));`
	`39`	`+ supportingFiles.add(new SupportingFile("snippets/go.mod.mustache", output + "/go/go.mod"));`
	`40`	`+ supportingFiles.add(new SupportingFile("snippets/go.sum.mustache", output + "/go/go.sum"));`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,9 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
`40`		`- public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {`
`41`		`- supportingFiles.add(new SupportingFile("tests/build.mustache", "snippets/java", "build.gradle"));`
`42`		`- supportingFiles.add(new SupportingFile("snippets/settings.mustache", "snippets/java", "settings.gradle"));`
	`40`	`+ public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {`
	`41`	`+ supportingFiles.add(new SupportingFile("tests/build.mustache", output + "/java", "build.gradle"));`
	`42`	`+ supportingFiles.add(new SupportingFile("snippets/settings.mustache", output + "/java", "settings.gradle"));`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,10 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
`40`		`- public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {`
`41`		`- supportingFiles.add(new SupportingFile("snippets/package.mustache", "snippets/javascript", "package.json"));`
`42`		`- supportingFiles.add(new SupportingFile("snippets/tsconfig.mustache", "snippets/javascript", "tsconfig.json"));`
`43`		`- supportingFiles.add(new SupportingFile("snippets/.yarnrc.mustache", "snippets/javascript", ".yarnrc.yml"));`
	`40`	`+ public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {`
	`41`	`+ supportingFiles.add(new SupportingFile("snippets/package.mustache", output + "/javascript", "package.json"));`
	`42`	`+ supportingFiles.add(new SupportingFile("snippets/tsconfig.mustache", output + "/javascript", "tsconfig.json"));`
	`43`	`+ supportingFiles.add(new SupportingFile("snippets/.yarnrc.mustache", output + "/javascript", ".yarnrc.yml"));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Override`
`34`		`- public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {`
`35`		`- supportingFiles.add(new SupportingFile("snippets/pyproject.mustache", "snippets/python", "pyproject.toml"));`
	`34`	`+ public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {`
	`35`	`+ supportingFiles.add(new SupportingFile("snippets/pyproject.mustache", output + "/python", "pyproject.toml"));`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void addDataToBundle(Map<String, Object> bundle) throws GeneratorExceptio`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
`31`		`- public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles) {`
`32`		`- supportingFiles.add(new SupportingFile("snippets/Gemfile.mustache", "snippets/ruby", "Gemfile"));`
	`31`	`+ public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {`
	`32`	`+ supportingFiles.add(new SupportingFile("snippets/Gemfile.mustache", output + "/ruby", "Gemfile"));`
`33`	`33`	`}`
`34`	`34`	`}`