@platformatic/sql-json-schema-mapper 0.20.0 → 0.21.0

package/index.js

@@ -16,7 +16,7 @@ function mapSQLTypeToOpenAPIType (sqlType) {
     case 'smallint':
       return 'integer'
     case 'decimal':
-      return 'number'
+      return 'string'
     case 'bigint':
       return 'string'
     case 'int2':
@@ -42,7 +42,7 @@ function mapSQLTypeToOpenAPIType (sqlType) {
     case 'double precision':
       return 'number'
     case 'numeric':
-      return 'number'
+      return 'string'
     case 'bigint unsigned':
       return 'integer'
     case 'float4':
@@ -123,7 +123,8 @@ function mapOpenAPItoTypes (obj, opts = {}) {
 
 function renderProperties (writer, addedProps, properties = {}, additionalProperties, required = []) {
   for (const name of Object.keys(properties)) {
-    const { type, nullable, items } = properties[name]
+    const localProperty = properties[name]
+    const { type, nullable, items } = localProperty
     addedProps.add(name)
     if (required.indexOf(name) !== -1) {
       writer.write(property(null, name))
@@ -170,6 +171,8 @@ function renderProperties (writer, addedProps, properties = {}, additionalProper
           const current = properties[name]
           renderProperties(writer, addedProps, current.properties, current.additionalProperties, current.required)
         })
+      } else if (type === 'string' && localProperty.enum) {
+        writer.write(localProperty.enum.sort().map((v) => `"${v}"`).join(' | '))
       } else {
         writer.write(JSONSchemaToTsType(type))
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-json-schema-mapper",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Map SQL entity to JSON schema",
   "main": "index.js",
   "repository": {
@@ -18,7 +18,7 @@
     "snazzy": "^9.0.0",
     "standard": "^17.0.0",
     "tap": "^16.3.4",
-    "@platformatic/sql-mapper": "0.20.0"
+    "@platformatic/sql-mapper": "0.21.0"
   },
   "dependencies": {
     "code-block-writer": "^12.0.0",

package/test/simple.test.js

@@ -91,7 +91,7 @@ test('simple db, simple rest API', async (t) => {
     t.same(pageJsonSchema.properties.id, { type: 'integer' })
     t.same(pageJsonSchema.properties.title, { type: 'string' })
     t.same(pageJsonSchema.properties.description, { type: 'string', nullable: true })
-    t.same(pageJsonSchema.properties.section, { type: 'number', nullable: true })
+    t.same(pageJsonSchema.properties.section, { type: 'string', nullable: true })
     if (isMariaDB) {
       t.same(pageJsonSchema.properties.metadata, { type: 'string', nullable: true })
     } else {

package/test/types.test.js

@@ -187,3 +187,25 @@ referenceTest('objects in arrays', {
     'title'
   ]
 })
+
+referenceTest('enums', {
+  id: 'Page',
+  title: 'Page',
+  description: 'A Page',
+  type: 'object',
+  properties: {
+    id: {
+      type: 'integer'
+    },
+    title: {
+      type: 'string'
+    },
+    color: {
+      type: 'string',
+      enum: ['amber', 'green', 'red']
+    }
+  },
+  required: [
+    'title'
+  ]
+})