Fix Kotlin integration

Author: tolyo

integrations/kotlin/Makefile

@@ -1,4 +1,4 @@
-.PHONY: all deps format format-check test generate generate-check parity check runtime-build example-build runtime-test release-check publish-local demo clean
+.PHONY: all deps format format-check test root-types generate generate-check parity check runtime-build example-build runtime-test release-check publish-local demo clean
 
 GRADLE ?= ./gradlew
 NODE ?= node
@@ -18,14 +18,17 @@ format-check:
 test: deps
 	$(GRADLE) jsBrowserTest
 
-generate:
+root-types:
+	$(MAKE) -C ../.. types
+
+generate: root-types
 	$(NODE) tool/generate_kotlin_bindings.mjs
 	$(GRADLE) formatKotlin
 
-generate-check:
+generate-check: root-types
 	$(NODE) tool/check_generated_bindings.mjs
 
-parity:
+parity: root-types
 	$(NODE) tool/check_ng_namespace_parity.mjs
 	$(NODE) tool/check_ng_namespace_members.mjs
 

integrations/kotlin/src/jsMain/kotlin/angular/ts/generated/NgFacades.kt

@@ -231,21 +231,16 @@ public external interface AnimateService {
 }
 
 public external interface AnimationHandle {
-    public var animations: dynamic
     public fun cancel(): Unit
     public fun catch(p0: Function<*> = definedExternally): dynamic
-    public var cleanup: dynamic
     public fun complete(p0: Boolean = definedExternally): Unit
     public var controller: dynamic
     public fun done(p0: Function<*> = definedExternally): Unit
-    public var doneCallbacks: dynamic
     public fun finally(p0: Function<*> = definedExternally): dynamic
     public fun finish(): Unit
     public var finished: dynamic
     public fun pause(): Unit
     public fun play(): Unit
-    public var settled: dynamic
-    public var status: dynamic
     public fun then(p0: Function<*> = definedExternally, p1: Function<*> = definedExternally): dynamic
 }
 

integrations/kotlin/tool/generate_kotlin_bindings.mjs

@@ -67,6 +67,13 @@ function extractNamespaceTypes(sourcePath, overrides) {
   const sourceFile = program.getSourceFile(sourcePath);
   const types = [];
 
+  if (!sourceFile) {
+    throw new Error(
+      `Unable to read generated namespace declarations at ${sourcePath}. ` +
+        "Run `make types` from the repository root first.",
+    );
+  }
+
   function visit(node, inNgNamespace = false) {
     if (ts.isModuleDeclaration(node)) {
       const nextInNgNamespace =
@@ -127,6 +134,7 @@ function collectMembers(checker, overrides, typeName, type) {
     const declaration = property.valueDeclaration ?? property.declarations?.[0];
 
     if (property.name === "__type" || !isRepoTypesNode(declaration)) continue;
+    if (!isPublicDeclaration(declaration)) continue;
     if (skippedByOverride(typeName, property.name, manual, unsupported)) continue;
 
     const propertyType = checker.getTypeOfSymbolAtLocation(property, declaration);
@@ -323,6 +331,14 @@ function isRepoTypesNode(node) {
   );
 }
 
+function isPublicDeclaration(node) {
+  return !node.modifiers?.some(
+    (modifier) =>
+      modifier.kind === ts.SyntaxKind.PrivateKeyword ||
+      modifier.kind === ts.SyntaxKind.ProtectedKeyword,
+  );
+}
+
 if (process.argv[1] === new URL(import.meta.url).pathname) {
   fs.mkdirSync(path.dirname(outputPath), { recursive: true });
   fs.writeFileSync(outputPath, generateBindings());