fix: initialize generated interface fields

Author: lisonge

CHANGELOG.md

@@ -3,12 +3,7 @@
 <!-- Keep only the latest release notes here. Do not include a version number or
 append older releases. Replace the entries below when publishing a new release. -->
 
-- Organize member-query output around individual `overloads`, with stable
-  identities, latest signatures, structured members, and independent version
-  ranges.
-- Distinguish a missing parameter signature with `overload-not-found`, and
-  expose the overloads available together through top-level range IDs.
-- Add a non-persistent Web selector for switching between all Java overloads
-  and one specific signature while keeping the aggregate view as the default.
-- Keep hidden-API code generation, cache invalidation, CLI documentation, and
-  the release-matched Codex Skill aligned with the new result model.
+- Initialize generated interface fields with `RemapStub.value()` so the Java
+  source compiles without embedding or inlining literal constants.
+- Omit redundant `static` and `final` modifiers from generated interface
+  fields while keeping class-field output unchanged.

packages/android-api-diff/package.json

@@ -1,6 +1,6 @@
 {
   "name": "android-api-diff",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Inspect Android framework API changes and generate hidden-API Java code",
   "type": "module",
   "keywords": [

packages/api-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@android-cs/api-parser",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "type": "module",
   "repository": {
     "type": "git",

packages/api-query/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@android-cs/api-query",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "type": "module",
   "repository": {
     "type": "git",

packages/api-query/scripts/code-render.test.ts

@@ -261,6 +261,51 @@ const baseResult = (
   assert.doesNotMatch(result.code, /transact\(.*RuntimeException/);
 }
 
+{
+  const staticField: AndroidApiMemberResult = {
+    kind: 'field',
+    name: 'STATE',
+    type: 'int',
+    imports: [],
+    isStatic: true,
+  };
+  const result = renderAndroidApiCodeWithMemberCode(
+    baseResult(
+      'IBinder.SHELL_COMMAND_TRANSACTION',
+      'core/java/android/os/IBinder.java',
+      ['IBinder', 'SHELL_COMMAND_TRANSACTION'],
+      [
+        range('8', 'O', 26, 'android-8.0.0_r1', [
+          constant('int', 'SHELL_COMMAND_TRANSACTION'),
+          staticField,
+        ]),
+      ],
+      [{ name: 'IBinder', kind: 'interface', isHidden: false }],
+    ),
+  );
+
+  assert.match(result.code, /import li\.songe\.remap\.RemapStub;/);
+  assert.match(result.code, /import li\.songe\.remap\.RemapType;/);
+  assert.match(
+    result.code,
+    /@RemapType\(IBinder\.class\)\npublic interface IBinderHidden \{/,
+  );
+  assert.match(
+    result.code,
+    /\n    int SHELL_COMMAND_TRANSACTION = RemapStub\.value\(\);\n/,
+  );
+  assert.match(result.code, /\n    int STATE = RemapStub\.value\(\);\n/);
+  assert.doesNotMatch(result.code, /\b(?:static|final)\s+int\b/);
+  assert.equal(
+    result.memberCode,
+    [
+      '    int SHELL_COMMAND_TRANSACTION = RemapStub.value();',
+      '',
+      '    int STATE = RemapStub.value();',
+    ].join('\n'),
+  );
+}
+
 {
   const result = renderAndroidApiCode(
     baseResult(

packages/api-query/src/code-render.ts

@@ -867,21 +867,25 @@ const formatFieldDeclaration = (
   sourceImports: string[],
   conflictingNames: Set<string>,
 ) => {
-  const prefix =
-    member.kind === 'constant' || member.isStatic
-      ? inInterface
-        ? 'static '
-        : 'public static '
-      : inInterface
-        ? ''
-        : 'public ';
+  const prefix = inInterface
+    ? ''
+    : member.kind === 'constant' || member.isStatic
+      ? 'public static '
+      : 'public ';
+  const initializer = inInterface
+    ? ` = ${getGeneratedName(
+        'RemapStub',
+        'li.songe.remap.RemapStub',
+        conflictingNames,
+      )}.value()`
+    : '';
   return `${indent(level)}${prefix}${formatAnnotatedType(
     member.type,
     member.fieldNullability,
     member,
     sourceImports,
     conflictingNames,
-  )} ${member.name};`;
+  )} ${member.name}${initializer};`;
 };
 
 const formatMemberDeclaration = (
@@ -1197,6 +1201,7 @@ const collectImports = (
   packageName: string,
   aidlSource: boolean,
   aidlInterface: boolean,
+  inInterface: boolean,
   actualClassPath: string[],
   displayClassPath: string[],
   baselineApiVersion: number | undefined,
@@ -1214,6 +1219,14 @@ const collectImports = (
   if (hasRemappedClass(actualClassPath, displayClassPath)) {
     addImport(imports, packageName, 'li.songe.remap.RemapType');
   }
+  if (
+    inInterface &&
+    declarations.some(
+      ({ member }) => member.kind === 'field' || member.kind === 'constant',
+    )
+  ) {
+    addImport(imports, packageName, 'li.songe.remap.RemapStub');
+  }
   if (declarations.some((declaration) => declaration.remapMethodName)) {
     addImport(imports, packageName, 'li.songe.remap.RemapMethod');
   }
@@ -1366,6 +1379,7 @@ const renderCode = (
     packageName,
     !!result.source?.path.endsWith('.aidl'),
     includeAidlStub,
+    inInterface,
     actualClassPath,
     displayClassPath,
     baselineApiVersion,