skir 1.0.1 → 1.0.4

package/src/command_line_parser.ts

@@ -22,6 +22,10 @@ export type ParsedArgs =
       kind: "help";
       root?: undefined;
     }
+  | {
+      kind: "version";
+      root?: undefined;
+    }
   | {
       kind: "error";
       root?: undefined;
@@ -46,6 +50,10 @@ export function parseCommandLine(args: string[]): ParsedArgs {
     return { kind: "help" };
   }
 
+  if (command === "version" || command === "--version" || command === "-v") {
+    return { kind: "version" };
+  }
+
   const validCommands = ["gen", "format", "snapshot", "init"];
   if (!command || !validCommands.includes(command)) {
     printError(`Unknown command: ${command}`);

package/src/compatibility_checker.ts

@@ -108,20 +108,18 @@ class BackwardCompatibilityChecker {
   check(): readonly BreakingChange[] {
     for (const moduleBefore of this.moduleSet.before.resolvedModules) {
       for (const methodBefore of moduleBefore.methods) {
-        if (methodBefore.hasExplicitNumber) {
-          const { number } = methodBefore;
-          const methodAfter = this.moduleSet.after.findMethodByNumber(number);
-          if (methodAfter === undefined) {
-            this.breakingChanges.push({
-              kind: "missing-method",
-              method: methodBefore,
-            });
-          } else {
-            this.checkMethod({
-              before: methodBefore,
-              after: methodAfter,
-            });
-          }
+        const { number } = methodBefore;
+        const methodAfter = this.moduleSet.after.findMethodByNumber(number);
+        if (methodAfter === undefined) {
+          this.breakingChanges.push({
+            kind: "missing-method",
+            method: methodBefore,
+          });
+        } else {
+          this.checkMethod({
+            before: methodBefore,
+            after: methodAfter,
+          });
         }
       }
       for (const recordBefore of moduleBefore.records) {
@@ -439,36 +437,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

@@ -34,7 +34,7 @@ export interface SkirConfigErrorPos {
   offset: number;
   /** 1-based */
   lineNumber: number;
-  /** 2-based */
+  /** 1-based */
   colNumber: number;
 }
 
@@ -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

@@ -27,7 +27,7 @@ import type {
   UnresolvedRecordRef,
   UnresolvedType,
 } from "skir-internal";
-import { convertCase, simpleHash } from "skir-internal";
+import { convertCase } from "skir-internal";
 import * as Casing from "./casing.js";
 import { mergeDocs } from "./doc_comment_parser.js";
 import { ModuleTokens } from "./tokenizer.js";
@@ -507,7 +507,7 @@ const PRIMITIVE_TYPES: ReadonlySet<string> = new Set<Primitive>([
   "bool",
   "int32",
   "int64",
-  "uint64",
+  "hash64",
   "float32",
   "float64",
   "timestamp",
@@ -862,19 +862,14 @@ function parseMethod(it: TokenIterator, doc: Doc): MutableMethod | null {
     return null;
   }
 
-  const explicitNumber = it.expectThenNext(["=", ";"]).case === 0;
-  let number: number;
-  if (explicitNumber) {
-    number = parseUint32(it);
-    if (number < 0) {
-      return null;
-    }
-    it.expectThenNext([";"]);
-  } else {
-    const methodName = nameMatch.token.text;
-    const { modulePath } = nameMatch.token.line;
-    number = simpleHash(`${modulePath}:${methodName}`);
+  if (it.expectThenNext(["="]).case < 0) {
+    return null;
+  }
+  const number = parseUint32(it);
+  if (number < 0) {
+    return null;
   }
+  it.expectThenNext([";"]);
 
   return {
     kind: "method",
@@ -887,7 +882,6 @@ function parseMethod(it: TokenIterator, doc: Doc): MutableMethod | null {
     // Will be populated at a later stage.
     responseType: undefined,
     number: number,
-    hasExplicitNumber: explicitNumber,
     inlineRequestRecord: requestTypeOrInlineRecord.inlineRecord,
     inlineResponseRecord: responseTypeOrInlineRecord.inlineRecord,
   };