skir 1.0.1 → 1.0.3

package/src/compatibility_checker.ts

@@ -439,36 +439,18 @@ function primitiveTypesAreCompatible(type: BeforeAfter<Primitive>): boolean {
         type.after === "bool" ||
         type.after === "int32" ||
         type.after === "int64" ||
-        type.after === "uint64" ||
-        type.after === "float32" ||
-        type.after === "float64"
+        type.after === "hash64"
       );
     case "int32":
-      return (
-        type.after === "int32" ||
-        type.after === "int64" ||
-        type.after === "uint64" ||
-        type.after === "float32" ||
-        type.after === "float64"
-      );
-    case "int64":
-      return (
-        type.after === "int64" ||
-        type.after === "float32" ||
-        type.after === "float64"
-      );
-    case "uint64":
-      return (
-        type.after === "uint64" ||
-        type.after === "float32" ||
-        type.after === "float64"
-      );
+      return type.after === "int32" || type.after === "int64";
     case "float32":
     case "float64":
       return type.after === "float32" || type.after === "float64";
     case "timestamp":
     case "string":
     case "bytes":
+    case "int64":
+    case "hash64":
       return type.after === type.before;
   }
 }

package/src/compiler.ts

@@ -335,6 +335,15 @@ async function format(root: string, mode: "fix" | "check"): Promise<void> {
 async function main(): Promise<void> {
   const args = parseCommandLine(process.argv.slice(2));
 
+  if (args.kind === "version") {
+    const packageJsonPath = new URL("../package.json", import.meta.url);
+    const packageJson = JSON.parse(
+      await FileSystem.readFile(packageJsonPath, "utf-8"),
+    );
+    console.log(`v${packageJson.version}`);
+    return;
+  }
+
   const root = args.root || ".";
 
   if (!(await isDirectory(root))) {

package/src/config_parser.ts

@@ -277,11 +277,13 @@ async function parseSkirConfigInternalAsync(
   return { skirConfig: zodResult.data!, errors: [] };
 }
 
+// TODO: remove the casts
 const STATIC_GENERATORS: Record<string, CodeGenerator<unknown>> = {
-  "skir-cc-gen": CcGen.GENERATOR,
-  "skir-dart-gen": DartGen.GENERATOR,
-  "skir-java-gen": JavaGen.GENERATOR,
-  "skir-kotlin-gen": KotlinGen.GENERATOR,
-  "skir-python-gen": PythonGen.GENERATOR,
-  "skir-typescript-gen": TypescriptGen.GENERATOR,
+  "skir-cc-gen": CcGen.GENERATOR as any as CodeGenerator<unknown>,
+  "skir-dart-gen": DartGen.GENERATOR as any as CodeGenerator<unknown>,
+  "skir-java-gen": JavaGen.GENERATOR as any as CodeGenerator<unknown>,
+  "skir-kotlin-gen": KotlinGen.GENERATOR as any as CodeGenerator<unknown>,
+  "skir-python-gen": PythonGen.GENERATOR as any as CodeGenerator<unknown>,
+  "skir-typescript-gen":
+    TypescriptGen.GENERATOR as any as CodeGenerator<unknown>,
 };

package/src/literals.ts

@@ -38,7 +38,7 @@ export function valueHasPrimitiveType(
         BigInt("-9223372036854775808"),
         BigInt("9223372036854775807"),
       );
-    case "uint64":
+    case "hash64":
       return isIntLiteral(token, BigInt(0), BigInt("18446744073709551615"));
     case "float32":
     case "float64": {
@@ -92,7 +92,7 @@ export function literalValueToDenseJson(
       return isStringLiteral(token) ? unquoteAndUnescape(token) : Number(token);
     }
     case "int64":
-    case "uint64":
+    case "hash64":
       return String(BigInt(token));
     case "string":
       return unquoteAndUnescape(token);

package/src/module_set.ts

@@ -642,7 +642,7 @@ export class ModuleSet {
           : !valueJson ||
             (Array.isArray(valueJson) && !valueJson.length) ||
             (type.kind === "primitive" &&
-              (type.primitive === "int64" || type.primitive === "uint64") &&
+              (type.primitive === "int64" || type.primitive === "hash64") &&
               valueJson === "0");
       if (!hasDefaultValue) {
         arrayLen = Math.max(arrayLen, field.number + 1);
@@ -774,7 +774,7 @@ export class ModuleSet {
           case "bool":
           case "int32":
           case "int64":
-          case "uint64":
+          case "hash64":
           case "float32":
           case "float64":
           case "timestamp":

package/src/parser.ts

@@ -507,7 +507,7 @@ const PRIMITIVE_TYPES: ReadonlySet<string> = new Set<Primitive>([
   "bool",
   "int32",
   "int64",
-  "uint64",
+  "hash64",
   "float32",
   "float64",
   "timestamp",