camelized props

Author: pyramation

__fixtures__/output/chain.camel.ts

@@ -150,8 +150,8 @@ export interface CosmosChain {
     rest?: Endpoint[];
     grpc?: Endpoint[];
     wss?: Endpoint[];
-    "grpc-web"?: Endpoint[];
-    "evm-http-jsonrpc"?: Endpoint[];
+    grpcWeb?: Endpoint[];
+    evmHttpJsonrpc?: Endpoint[];
   };
   explorers?: Explorer[];
   keywords?: string[];

__tests__/__snapshots__/chain.test.ts.snap

@@ -315,8 +315,8 @@ export interface CosmosChain {
     rest?: Endpoint[];
     grpc?: Endpoint[];
     wss?: Endpoint[];
-    "grpc-web"?: Endpoint[];
-    "evm-http-jsonrpc"?: Endpoint[];
+    grpcWeb?: Endpoint[];
+    evmHttpJsonrpc?: Endpoint[];
   };
   explorers?: Explorer[];
   keywords?: string[];

src/schema.ts

@@ -3,7 +3,7 @@ import * as t from "@babel/types";
 
 import { SchemaTSContext, type SchemaTSOptions } from "./context";
 import type { JSONSchema } from "./types";
-import { isValidIdentifier, toCamelCase, toPascalCase } from "./utils";
+import { isValidIdentifier, isValidIdentifierCamelized, toCamelCase, toPascalCase } from "./utils";
 
 const identifier = (name: string, typeAnnotation: t.TSTypeAnnotation) => {
   const i = t.identifier(name);
@@ -126,13 +126,18 @@ function createPropertySignature(
   required: string[],
   schema: JSONSchema
 ): t.TSPropertySignature {
-
-  const isIdent = isValidIdentifier(key);
   let camelCaseFn: (str: string) => string = toCamelCase;
   if (ctx.options.camelCaseFn) camelCaseFn = ctx.options.camelCaseFn;
   const name = ctx.options.camelCase ? camelCaseFn(key) : key;
   const propType = getTypeForProp(ctx, prop, required, schema);
-  const identifier = isIdent ? t.identifier(name) : t.stringLiteral(key);
+  let identifier: t.Identifier | t.StringLiteral;
+  let isIdent: boolean;
+  if (ctx.options.camelCase) {
+    isIdent = isValidIdentifierCamelized(key);  
+  } else {
+    isIdent = isValidIdentifier(key);
+  }
+  identifier = isIdent ? t.identifier(name) : t.stringLiteral(key);
   const propSig = t.tsPropertySignature(
     identifier,
     t.tsTypeAnnotation(propType)

src/utils.ts

@@ -12,7 +12,13 @@ export function toCamelCase(key: string) {
       .replace(/^./, (c) => c.toLowerCase());
 }
 
-// Determine if the key is a valid JavaScript identifier
+// // Determine if the key is a valid JavaScript identifier
 export function isValidIdentifier(key: string) {
   return /^[$A-Z_][0-9A-Z_$]*$/i.test(key) && !/^[0-9]+$/.test(key);
-}
+}
+
+
+// Determine if the key is a valid JavaScript-like identifier, allowing internal hyphens
+export function isValidIdentifierCamelized(key: string) {
+  return /^[$A-Z_][0-9A-Z_$\-]*$/i.test(key) && !/^[0-9]+$/.test(key) && !/^-/.test(key);
+}