vovk-cli 0.0.1-draft.275 → 0.0.1-draft.277

package/dist/utils/compileTs.mjs

@@ -8,7 +8,9 @@ export function compileTs(options) {
     };
     // Collect all definitions from the schema
     collectDefinitions(options.schema, context.refs);
-    const mainType = compileSchema(options.schema, options.name, context);
+    // Ensure the main type name is valid
+    const mainTypeName = sanitizeTypeName(options.name);
+    const mainType = compileSchema(options.schema, mainTypeName, context);
     // Compile all referenced types, unless dontCreateRefTypes is set
     const compiledRefs = options.dontCreateRefTypes
         ? ''
@@ -16,8 +18,8 @@ export function compileTs(options) {
             .map(([, typeDecl]) => typeDecl)
             .join('\n\n');
     return compiledRefs
-        ? `${compiledRefs}\n\n${options.schema.description ? `/** ${options.schema.description} */\n` : ''}export type ${options.name} = ${mainType};`
-        : `${options.schema.description ? `/** ${options.schema.description} */\n` : ''}export type ${options.name} = ${mainType};`;
+        ? `${compiledRefs}\n\n${options.schema.description ? `/** ${escapeJSDocComment(options.schema.description)} */\n` : ''}export type ${mainTypeName} = ${mainType};`
+        : `${options.schema.description ? `/** ${escapeJSDocComment(options.schema.description)} */\n` : ''}export type ${mainTypeName} = ${mainType};`;
 }
 function collectDefinitions(schema, refs) {
     // Collect from $defs
@@ -151,14 +153,16 @@ function handleRef(ref, context) {
     context.refsInProgress.add(ref);
     // Compile the referenced schema
     const compiledType = compileSchema(referencedSchema, typeName, context);
-    const description = referencedSchema.description ? `/** ${referencedSchema.description} */\n` : '';
+    const description = referencedSchema.description
+        ? `/** ${escapeJSDocComment(referencedSchema.description)} */\n`
+        : '';
     context.compiledRefs.set(ref, `${description}export type ${typeName} = ${compiledType};`);
     // Mark as completed
     context.refsInProgress.delete(ref);
     return typeName;
 }
 function handleAllOf(schemas, name, context) {
-    const types = schemas.map((s, i) => compileSchema(s, `${name}AllOf${i}`, context));
+    const types = schemas.map((s, i) => compileSchema(s, sanitizeTypeName(`${name}-all-of-${i}`), context));
     // For allOf, we need to intersect types
     // If they're all objects, we can merge them properly
     const objectTypes = types.filter((t) => t.startsWith('{') && t.endsWith('}'));
@@ -170,12 +174,12 @@ function handleAllOf(schemas, name, context) {
     return types.join(' & ');
 }
 function handleAnyOf(schemas, name, context) {
-    const types = schemas.map((s, i) => compileSchema(s, `${name}AnyOf${i}`, context));
+    const types = schemas.map((s, i) => compileSchema(s, sanitizeTypeName(`${name}-any-of-${i}`), context));
     return types.join(' | ');
 }
 function handleOneOf(schemas, name, context) {
     // For TypeScript, oneOf behaves like anyOf
-    const types = schemas.map((s, i) => compileSchema(s, `${name}OneOf${i}`, context));
+    const types = schemas.map((s, i) => compileSchema(s, sanitizeTypeName(`${name}-one-of-${i}`), context));
     return types.join(' | ');
 }
 function handleEnum(enumValues) {
@@ -205,10 +209,12 @@ function handleObject(schema, name, context) {
             if (!isSchema(propSchema))
                 continue;
             const isRequired = required.has(propName);
-            const propType = compileSchema(propSchema, `${name}${capitalize(propName)}`, context);
+            // Ensure the generated type name for nested properties is valid
+            const nestedTypeName = sanitizeTypeName(`${name}-${propName}`);
+            const propType = compileSchema(propSchema, nestedTypeName, context);
             const safePropName = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(propName) ? propName : `"${propName}"`;
             // Add JSDoc comment if description is present
-            const comment = propSchema.description ? `\n/** ${propSchema.description} */\n` : '';
+            const comment = propSchema.description ? `\n/** ${escapeJSDocComment(propSchema.description)} */\n` : '';
             props.push(`${comment}${safePropName}${isRequired ? '' : '?'}: ${propType}`);
         }
     }
@@ -217,7 +223,8 @@ function handleObject(schema, name, context) {
         props.push('[key: string]: any');
     }
     else if (schema.additionalProperties && isSchema(schema.additionalProperties)) {
-        const additionalType = compileSchema(schema.additionalProperties, `${name}Additional`, context);
+        const additionalTypeName = sanitizeTypeName(`${name}-additional`);
+        const additionalType = compileSchema(schema.additionalProperties, additionalTypeName, context);
         props.push(`[key: string]: ${additionalType}`);
     }
     // Handle pattern properties
@@ -225,7 +232,7 @@ function handleObject(schema, name, context) {
         // For simplicity, treat pattern properties as string index signature
         const patternTypes = Object.values(schema.patternProperties)
             .filter(isSchema)
-            .map((s, i) => compileSchema(s, `${name}Pattern${i}`, context));
+            .map((s, i) => compileSchema(s, sanitizeTypeName(`${name}-pattern-${i}`), context));
         if (patternTypes.length > 0) {
             props.push(`[key: string]: ${patternTypes.join(' | ')}`);
         }
@@ -239,10 +246,16 @@ function refToTypeName(ref) {
     // Convert kebab-case to PascalCase
     return upperFirst(camelCase(name));
 }
-function capitalize(str) {
-    return str.charAt(0).toUpperCase() + str.slice(1);
-}
 function wrapUnionType(type) {
     // Wrap union types in parentheses for array types
     return type.includes('|') ? `(${type})` : type;
 }
+function sanitizeTypeName(name) {
+    return upperFirst(camelCase(name));
+}
+// Utility function to escape JSDoc comment terminators in descriptions
+function escapeJSDocComment(description) {
+    if (!description)
+        return '';
+    return description.replace(/\*\//g, '*\\/');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.275",
+  "version": "0.0.1-draft.277",
   "bin": {
     "vovk": "./dist/index.mjs"
   },