skir-java-gen 1.0.0 → 1.0.2

package/README.md

@@ -5,22 +5,23 @@
 
 Official plugin for generating Java code from [.skir](https://github.com/gepheum/skir) files.
 
-## Installation
-
-From your project's root directory, run `npm i --save-dev skir-java-gen`.
+## Set up
 
 In your `skir.yml` file, add the following snippet under `generators`:
 ```yaml
   - mod: skir-java-gen
+    outDir: ./src/main/java/skirout
     config: {}
+    # Alternatively:
+    # outDir: ./src/main/kotlin/my/project/skirout
+    # config:
+    #   packagePrefix: my.project.
 ```
 
-The `npm run skirc` command will now generate .java files within the `skirout` directory.
-
-The generated Java code has a runtime dependency on `build.skir:skir-kotlin-client`. Add this line to your `build.gradle` file in the `dependencies` section:
+The generated Java code has a runtime dependency on `build.skir:skir-client`. Add this line to your `build.gradle` file in the `dependencies` section:
 
 ```gradle
-implementation 'build.skir:skir-kotlin-client:1.1.4'  // Pick the latest version
+implementation 'build.skir:skir-client:latest.release'
 ```
 
 For more information, see this Java project [example](https://github.com/gepheum/skir-java-example).
@@ -229,7 +230,7 @@ System.out.println(serializer.toJsonCode(john, JsonFlavor.READABLE));
 // }
 
 // The dense JSON flavor is the flavor you should pick if you intend to
-// deserialize the value in the future. skir allows fields to be renamed,
+// deserialize the value in the future. Skir allows fields to be renamed,
 // and because field names are not part of the dense JSON, renaming a field
 // does not prevent you from deserializing the value.
 // You should pick the readable flavor mostly for debugging purposes.
@@ -266,8 +267,8 @@ assert reserializedJane.equals(jane);
 ### Frozen lists and copies
 
 ```java
-// Since all skir objects are deeply immutable, all lists contained in a
-// skir object are also deeply immutable.
+// Since all Skir objects are deeply immutable, all lists contained in a
+// Skir object are also deeply immutable.
 // This section helps understand when lists are copied and when they are
 // not.
 
@@ -289,12 +290,9 @@ final User jade =
     User.partialBuilder()
         .setName("Jade")
         .setPets(pets)
-        // 'pets' is mutable, so skir makes an immutable shallow copy of it
+        // 'pets' is mutable, so Skir makes an immutable shallow copy of it
         .build();
 
-// jade.pets().clear();
-// ^ Runtime error: pets is a frozen list
-
 assert pets.equals(jade.pets());
 assert pets != jade.pets();
 
@@ -302,7 +300,7 @@ final User jack =
     User.partialBuilder()
         .setName("Jack")
         .setPets(jade.pets())
-        // The list is already immutable, so skir does not make a copy
+        // The list is already immutable, so Skir does not make a copy
         .build();
 
 assert jack.pets() == jade.pets();
@@ -314,7 +312,7 @@ assert jack.pets() == jade.pets();
 final UserRegistry userRegistry =
     UserRegistry.builder().setUsers(List.of(john, jane, evilJohn)).build();
 
-// findByKey() returns the user with the given key (specified in the .skir file).
+// find() returns the user with the given key (specified in the .skir file).
 // In this example, the key is the user id.
 // The first lookup runs in O(N) time, and the following lookups run in O(1)
 // time.
@@ -421,4 +419,4 @@ While Java and Kotlin code can interoperate seamlessly, skir provides separate c
 
 Although it's technically feasible to use Kotlin-generated code in a Java project (or vice versa), doing so results in an API that feels unnatural and cumbersome in the calling language. For the best developer experience, use the code generator that matches your project's primary language.
 
-Note that both the Java and Kotlin generated code share the same runtime dependency: `build.skir:skir-kotlin-client`.
+Note that both the Java and Kotlin generated code share the same runtime dependency: `build.skir:skir-client`.

package/dist/index.js

@@ -550,7 +550,7 @@ class JavaSourceFileGenerator {
                         return "false";
                     case "int32":
                     case "int64":
-                    case "uint64":
+                    case "hash64":
                         return "0";
                     case "float32":
                         return "0.0f";
@@ -602,7 +602,7 @@ class JavaSourceFileGenerator {
                     case "bool":
                     case "int32":
                     case "int64":
-                    case "uint64":
+                    case "hash64":
                     case "float32":
                     case "float64":
                         return inputExpr;

package/dist/type_speller.js

@@ -61,7 +61,7 @@ export class TypeSpeller {
                         case "int32":
                             return "java.lang.Integer";
                         case "int64":
-                        case "uint64":
+                        case "hash64":
                             return "java.lang.Long";
                         case "float32":
                             return "java.lang.Float";
@@ -86,7 +86,7 @@ export class TypeSpeller {
                         case "int32":
                             return "int";
                         case "int64":
-                        case "uint64":
+                        case "hash64":
                             return "long";
                         case "float32":
                             return "float";
@@ -121,8 +121,8 @@ export class TypeSpeller {
                         return "build.skir.Serializers.int32()";
                     case "int64":
                         return "build.skir.Serializers.int64()";
-                    case "uint64":
-                        return "build.skir.Serializers.javaUint64()";
+                    case "hash64":
+                        return "build.skir.Serializers.javaHash64()";
                     case "float32":
                         return "build.skir.Serializers.float32()";
                     case "float64":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skir-java-gen",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "",
   "keywords": [],
   "repository": {
@@ -33,7 +33,7 @@
     "lint:fix": "eslint src/**/*.ts --fix"
   },
   "dependencies": {
-    "skir-internal": "^0.0.8",
+    "skir-internal": "^0.1.0",
     "zod": "^4.2.1"
   },
   "devDependencies": {
@@ -47,7 +47,7 @@
     "mocha": "^11.7.5",
     "prettier": "^3.2.4",
     "prettier-plugin-organize-imports": "^4.2.0",
-    "skir": "^0.0.7",
+    "skir": "^1.0.11",
     "ts-node": "^10.9.2",
     "tsx": "^4.21.0",
     "typescript": "^5.2.2",

package/src/index.ts

@@ -874,7 +874,7 @@ class JavaSourceFileGenerator {
             return "false";
           case "int32":
           case "int64":
-          case "uint64":
+          case "hash64":
             return "0";
           case "float32":
             return "0.0f";
@@ -931,7 +931,7 @@ class JavaSourceFileGenerator {
           case "bool":
           case "int32":
           case "int64":
-          case "uint64":
+          case "hash64":
           case "float32":
           case "float64":
             return inputExpr;

package/src/type_speller.ts

@@ -74,7 +74,7 @@ export class TypeSpeller {
             case "int32":
               return "java.lang.Integer";
             case "int64":
-            case "uint64":
+            case "hash64":
               return "java.lang.Long";
             case "float32":
               return "java.lang.Float";
@@ -98,7 +98,7 @@ export class TypeSpeller {
             case "int32":
               return "int";
             case "int64":
-            case "uint64":
+            case "hash64":
               return "long";
             case "float32":
               return "float";
@@ -135,8 +135,8 @@ export class TypeSpeller {
             return "build.skir.Serializers.int32()";
           case "int64":
             return "build.skir.Serializers.int64()";
-          case "uint64":
-            return "build.skir.Serializers.javaUint64()";
+          case "hash64":
+            return "build.skir.Serializers.javaHash64()";
           case "float32":
             return "build.skir.Serializers.float32()";
           case "float64":