fix: allow enum values to start with a number

aldis-ameriks · Jan 26, 2024 · ee50133 · ee50133
1 parent d483415
commit ee50133
Show file tree

Hide file tree

Showing 12 changed files with 418 additions and 10 deletions.
diff --git a/cjs/src/typescript.js b/cjs/src/typescript.js
@@ -20,21 +20,22 @@ function sortByField (name) {
 
 function toPascalCase (value) {
   let replaced = value.replace(/((_|-|\s)\w)/g, (token) => token[1].toUpperCase())
+  replaced = replaced.replace(/((\d)\w)/g, (token) => token[0] + token[1].toUpperCase())
   replaced = replaced.charAt(0).toUpperCase() + replaced.slice(1)
   replaced = replaced.replace(/_|-|\s/g, '')
   return replaced
 }
 
 function formatName (name) {
-  if (name.match(/(-|\s|\.)/g)) {
+  if (name.match(/(-|\s|\.)/g) || name.match(/^\d/)) {
     name = `'${name}'`
   }
   return name
 }
 
 function formatEnumName (opts, name) {
   if (opts.pascalEnums) {
-    return toPascalCase(name)
+    return formatName(toPascalCase(name))
   }
 
   return formatName(name)

diff --git a/cjs/test/cli.js b/cjs/test/cli.js
@@ -123,7 +123,7 @@ t.test('reports success to stdout', t => {
   })
 
   child.on('close', () => {
-    t.equal(result.data, '✔ Generated types from 9 tables and 3 enums\n')
+    t.equal(result.data, '✔ Generated types from 9 tables and 4 enums\n')
   })
 })
 
@@ -167,7 +167,7 @@ t.test('generates types with header', t => {
   })
 })
 
-t.test('generates types with pascal case enums', t => {
+t.only('generates types with pascal case enums', t => {
   t.plan(1)
 
   const child = childProcess.spawn(process.execPath, [path.join(__dirname, '..', 'src', 'index.js'), connection, ssl ? '--ssl' : '', '--pascal-enums'], {

diff --git a/cjs/test/helpers/setup-postgres.js b/cjs/test/helpers/setup-postgres.js
@@ -55,6 +55,15 @@ module.exports.setupTestPostgres = setupTestPostgres; async function setupTestPo
               'a_plane'
           );
       `
+
+      await sql`
+          CREATE TYPE "numeric_names" AS ENUM (
+              '1name',
+              '2Name',
+              '3-name',
+              '4_name'
+            );
+      `
     } catch (e) { }
 
     await sql`

diff --git a/src/typescript.js b/src/typescript.js
@@ -20,21 +20,22 @@ function sortByField (name) {
 
 function toPascalCase (value) {
   let replaced = value.replace(/((_|-|\s)\w)/g, (token) => token[1].toUpperCase())
+  replaced = replaced.replace(/((\d)\w)/g, (token) => token[0] + token[1].toUpperCase())
   replaced = replaced.charAt(0).toUpperCase() + replaced.slice(1)
   replaced = replaced.replace(/_|-|\s/g, '')
   return replaced
 }
 
 function formatName (name) {
-  if (name.match(/(-|\s|\.)/g)) {
+  if (name.match(/(-|\s|\.)/g) || name.match(/^\d/)) {
     name = `'${name}'`
   }
   return name
 }
 
 function formatEnumName (opts, name) {
   if (opts.pascalEnums) {
-    return toPascalCase(name)
+    return formatName(toPascalCase(name))
   }
 
   return formatName(name)

diff --git a/tap-snapshots/cjs/test/cli.js.test.cjs b/tap-snapshots/cjs/test/cli.js.test.cjs
@@ -19,6 +19,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -190,6 +197,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -361,6 +375,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -531,6 +552,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -702,6 +730,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -761,6 +796,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -932,6 +974,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -1238,6 +1287,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -1409,6 +1465,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -1580,6 +1643,13 @@ export enum Fruits {
   Orange = 'orange',
 }
 
+export enum NumericNames {
+  '1Name' = '1name',
+  '2Name' = '2Name',
+  '3Name' = '3-name',
+  '4Name' = '4_name',
+}
+
 export enum SnakesOn {
   APlane = 'a_plane',
 }
@@ -1751,6 +1821,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -1922,6 +1999,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }

diff --git a/tap-snapshots/cjs/test/pg-typegen.js.test.cjs b/tap-snapshots/cjs/test/pg-typegen.js.test.cjs
@@ -23,6 +23,15 @@ Object {
         "orange",
       ],
     },
+    Object {
+      "name": "numeric_names",
+      "values": Array [
+        "1name",
+        "2Name",
+        "3-name",
+        "4_name",
+      ],
+    },
     Object {
       "name": "snakes_on",
       "values": Array [
@@ -1360,6 +1369,13 @@ Object {
       orange = 'orange',
     }
     
+    export enum NumericNames {
+      '1name' = '1name',
+      '2Name' = '2Name',
+      '3-name' = '3-name',
+      '4_name' = '4_name',
+    }
+    
     export enum SnakesOn {
       a_plane = 'a_plane',
     }
@@ -1667,6 +1683,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -1837,6 +1860,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -1996,7 +2026,7 @@ export interface UserEntity {
 `
 
 exports['cjs/test/pg-typegen.js > TAP > generates types to file > must match snapshot 2'] = `
-✔ Generated types from 9 tables and 3 enums
+✔ Generated types from 9 tables and 4 enums
 `
 
 exports['cjs/test/pg-typegen.js > TAP > generates types with comments > must match snapshot 1'] = `
@@ -2011,6 +2041,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -2194,6 +2231,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -2525,6 +2569,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -2830,6 +2881,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }
@@ -3125,6 +3183,13 @@ export enum Fruits {
   orange = 'orange',
 }
 
+export enum NumericNames {
+  '1name' = '1name',
+  '2Name' = '2Name',
+  '3-name' = '3-name',
+  '4_name' = '4_name',
+}
+
 export enum SnakesOn {
   a_plane = 'a_plane',
 }