Revision 0.10.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sinclair/typebox-codegen",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Code Generation Tools for TypeBox",
   "main": "index.js",
   "keywords": [

src/common/encoder.ts

@@ -35,7 +35,7 @@ namespace Character {
     return code === 95
   }
   export function IsAlpha(code: number) {
-    return (code >= 64 && code <= 90) || (code >= 97 && code <= 122)
+    return (code >= 65 && code <= 90) || (code >= 97 && code <= 122)
   }
   export function IsNumeric(code: number) {
     return code >= 48 && code <= 57
@@ -73,7 +73,7 @@ export namespace PropertyEncoder {
     if (value.length === 0) return false
     return Character.IsNumeric(value.charCodeAt(0))
   }
-  function IsSafeProperty(value: string) {
+  function IsAccessor(value: string) {
     if (IsFirstCharacterNumeric(value)) return false
     for (let i = 0; i < value.length; i++) {
       const code = value.charCodeAt(i)
@@ -82,10 +82,10 @@ export namespace PropertyEncoder {
     }
     return true
   }
-  function Quoted(value: string) {
-    return `'${value}'`
+  function EscapeHyphen(key: string) {
+    return key.replace(/'/g, "\\'")
   }
-  export function Encode(value: string) {
-    return IsSafeProperty(value) ? value : Quoted(value)
+  export function Encode(key: string) {
+    return IsAccessor(key) ? `${key}` : `'${EscapeHyphen(key)}'`
   }
 }

src/model/model-to-typescript.ts

@@ -25,52 +25,10 @@ THE SOFTWARE.
 ---------------------------------------------------------------------------*/
 
 import { TypeBoxModel } from './model'
-import { Formatter } from '../common/formatter'
+import { Formatter, PropertyEncoder } from '../common/index'
 import { TypeCompiler } from '@sinclair/typebox/compiler'
 import * as Types from '@sinclair/typebox'
 
-// ------------------------------------------------------------------
-// Character
-// ------------------------------------------------------------------
-namespace Character {
-  export function DollarSign(code: number) {
-    return code === 36
-  }
-  export function IsUnderscore(code: number) {
-    return code === 95
-  }
-  export function IsAlpha(code: number) {
-    return (code >= 65 && code <= 90) || (code >= 97 && code <= 122)
-  }
-  export function IsNumeric(code: number) {
-    return code >= 48 && code <= 57
-  }
-}
-// ------------------------------------------------------------------
-// PropertyKey
-// ------------------------------------------------------------------
-namespace PropertyKey {
-  function IsFirstCharacterNumeric(value: string) {
-    if (value.length === 0) return false
-    return Character.IsNumeric(value.charCodeAt(0))
-  }
-  function IsAccessor(value: string) {
-    if (IsFirstCharacterNumeric(value)) return false
-    for (let i = 0; i < value.length; i++) {
-      const code = value.charCodeAt(i)
-      const check = Character.IsAlpha(code) || Character.IsNumeric(code) || Character.DollarSign(code) || Character.IsUnderscore(code)
-      if (!check) return false
-    }
-    return true
-  }
-  function EscapeHyphen(key: string) {
-    return key.replace(/'/g, "\\'")
-  }
-  export function Encode(key: string) {
-    return IsAccessor(key) ? `${key}` : `'${EscapeHyphen(key)}'`
-  }
-}
-
 export namespace ModelToTypeScript {
   function Any(schema: Types.TAny) {
     return 'any'
@@ -132,7 +90,7 @@ export namespace ModelToTypeScript {
         (optional && readonly) ? `readonly ${key}?: ${Visit(property)}` :
         readonly ? `readonly ${key}: ${Visit(property)}` :
         optional ? `${key}?: ${Visit(property)}` :
-        `${PropertyKey.Encode(key)}: ${Visit(property)}`
+        `${PropertyEncoder.Encode(key)}: ${Visit(property)}`
       )
     }).join(',\n')
     return `{\n${properties}\n}`