@bagelink/sdk 1.6.41 → 1.6.43

package/dist/index.cjs

@@ -662,26 +662,27 @@ function generateTypes(schemas) {
       return `export type ${typeName} = ${schema.enum.map((item) => `'${item}'`).join(" | ")};
 `;
     }
-    if ("array" === schema?.type && schema.items) {
+    if (schema?.type === "array" && schema.items) {
       return `export type ${typeName} = (${schemaToType(schema.items)})[];
 `;
     }
     if (!schema.properties) {
-      if (true === schema.additionalProperties) {
+      if (schema.additionalProperties === true) {
         return `export type ${typeName} = { [key: string]: any };
 `;
       }
       return "";
     }
-    if (0 === Object.keys(schema.properties).length && true === schema.additionalProperties) {
+    if (Object.keys(schema.properties).length === 0 && schema.additionalProperties === true) {
       return `export type ${typeName} = { [key: string]: any };
 `;
     }
     const properties = Object.entries(schema.properties).map(([key, value]) => {
-      const varType = formatVarType({ varName: key, schema: value });
+      const quotedKey = /^[a-z_$][\w$]*$/i.test(key) ? key : `'${key}'`;
+      const varType = formatVarType({ varName: quotedKey, schema: value });
       return `		${varType}`;
     }).join(";\n ");
-    const indexSignature = true === schema.additionalProperties ? "\n		[key: string]: any;" : "";
+    const indexSignature = schema.additionalProperties === true ? "\n		[key: string]: any;" : "";
     return `export type ${typeName} = {
  ${properties};${indexSignature}
  };

package/dist/index.mjs

@@ -656,26 +656,27 @@ function generateTypes(schemas) {
       return `export type ${typeName} = ${schema.enum.map((item) => `'${item}'`).join(" | ")};
 `;
     }
-    if ("array" === schema?.type && schema.items) {
+    if (schema?.type === "array" && schema.items) {
       return `export type ${typeName} = (${schemaToType(schema.items)})[];
 `;
     }
     if (!schema.properties) {
-      if (true === schema.additionalProperties) {
+      if (schema.additionalProperties === true) {
         return `export type ${typeName} = { [key: string]: any };
 `;
       }
       return "";
     }
-    if (0 === Object.keys(schema.properties).length && true === schema.additionalProperties) {
+    if (Object.keys(schema.properties).length === 0 && schema.additionalProperties === true) {
       return `export type ${typeName} = { [key: string]: any };
 `;
     }
     const properties = Object.entries(schema.properties).map(([key, value]) => {
-      const varType = formatVarType({ varName: key, schema: value });
+      const quotedKey = /^[a-z_$][\w$]*$/i.test(key) ? key : `'${key}'`;
+      const varType = formatVarType({ varName: quotedKey, schema: value });
       return `		${varType}`;
     }).join(";\n ");
-    const indexSignature = true === schema.additionalProperties ? "\n		[key: string]: any;" : "";
+    const indexSignature = schema.additionalProperties === true ? "\n		[key: string]: any;" : "";
     return `export type ${typeName} = {
  ${properties};${indexSignature}
  };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/sdk",
   "type": "module",
-  "version": "1.6.41",
+  "version": "1.6.43",
   "description": "Bagel core sdk packages",
   "author": {
     "name": "Bagel Studio",

package/src/openAPITools/typeGenerator.ts

@@ -3,25 +3,25 @@ import { isSchemaObject } from './types/utils'
 import { formatType, formatVarType, schemaToType } from './utils'
 
 export function generateTypes(schemas: ComponentsObject['schemas']): string {
-	if (!schemas) {return ''}
+	if (!schemas) { return '' }
 	const schemaEntries = Object.entries(schemas)
 
 	return schemaEntries
 		.map(([_typeName, schema]) => {
 			const typeName = formatType(_typeName)
 
-			if (!isSchemaObject(schema)) {return ''}
+			if (!isSchemaObject(schema)) { return '' }
 
 			if (schema?.enum) {
 				return `export type ${typeName} = ${schema.enum.map((item: string) => `'${item}'`).join(' | ')};\n`
 			}
 
-			if ('array' === schema?.type && schema.items) {
+			if (schema?.type === 'array' && schema.items) {
 				return `export type ${typeName} = (${schemaToType(schema.items)})[];\n`
 			}
 			if (!schema.properties) {
 				// Handle case where schema has additionalProperties: true
-				if (true === schema.additionalProperties) {
+				if (schema.additionalProperties === true) {
 					return `export type ${typeName} = { [key: string]: any };\n`
 				}
 				// #region Debug
@@ -33,20 +33,22 @@ export function generateTypes(schemas: ComponentsObject['schemas']): string {
 			}
 
 			// Handle empty properties with additionalProperties
-			if (0 === Object.keys(schema.properties).length && true === schema.additionalProperties) {
+			if (Object.keys(schema.properties).length === 0 && schema.additionalProperties === true) {
 				return `export type ${typeName} = { [key: string]: any };\n`
 			}
 
 			const properties = Object.entries(schema.properties)
 				.map(([key, value]) => {
-					const varType = formatVarType({ varName: key, schema: value })
+					// Wrap key in quotes if it contains hyphens or isn't a valid identifier
+					const quotedKey = /^[a-z_$][\w$]*$/i.test(key) ? key : `'${key}'`
+					const varType = formatVarType({ varName: quotedKey, schema: value })
 
 					return `\t\t${varType}`
 				})
 				.join(';\n ')
 
 			// Add index signature for additionalProperties if true
-			const indexSignature = true === schema.additionalProperties ? '\n\t\t[key: string]: any;' : ''
+			const indexSignature = schema.additionalProperties === true ? '\n\t\t[key: string]: any;' : ''
 
 			return `export type ${typeName} = {\n ${properties};${indexSignature}\n };\n`
 		})