vovk-cli 0.0.1-draft.248 → 0.0.1-draft.249

package/dist/getProjectInfo/getConfig/index.mjs

@@ -62,8 +62,8 @@ export default async function getConfig({ configPath, cwd }) {
         prettifyClient: (env.VOVK_PRETTIFY_CLIENT ? !!env.VOVK_PRETTIFY_CLIENT : null) ?? conf.prettifyClient ?? false,
         devHttps: (env.VOVK_DEV_HTTPS ? !!env.VOVK_DEV_HTTPS : null) ?? conf.devHttps ?? false,
         moduleTemplates: {
-            service: 'vovk-cli/module-templates/Service.ts.ejs',
-            controller: 'vovk-cli/module-templates/Controller.ts.ejs',
+            service: 'vovk-cli/module-templates/service.ts.ejs',
+            controller: 'vovk-cli/module-templates/controller.ts.ejs',
             ...conf.moduleTemplates,
         },
         libs: conf.libs ?? {},

package/dist/init/createConfig.mjs

@@ -12,8 +12,8 @@ export default async function createConfig({ root, log, options: { validationLib
         .then((content) => JSON.parse(content).type === 'module');
     const configAbsolutePath = path.join(dir, isModule ? 'vovk.config.mjs' : 'vovk.config.js');
     const moduleTemplates = {
-        controller: 'vovk-cli/module-templates/Controller.ts.ejs',
-        service: 'vovk-cli/module-templates/Service.ts.ejs',
+        controller: 'vovk-cli/module-templates/controller.ts.ejs',
+        service: 'vovk-cli/module-templates/service.ts.ejs',
     };
     if (validationLibrary) {
         config.imports ??= {};

package/dist/utils/convertJSONSchemaToTypeScriptDef.mjs

@@ -75,7 +75,7 @@ export function convertJSONSchemaToTypeScriptDef(schema, defsPrefix) {
     const getRefTypeName = (ref) => {
         if (ref.startsWith('#/definitions/') || ref.startsWith('#/$defs/')) {
             const path = ref.split('/');
-            return `${defsPrefix}__${path[path.length - 1]}`;
+            return `${defsPrefix}__${path[path.length - 1].replace(/[^a-zA-Z0-9_$]/g, '_')}`;
         }
         return 'KnownAny'; // Fallback for external references
     };
@@ -243,7 +243,9 @@ export function convertJSONSchemaToTypeScriptDef(schema, defsPrefix) {
             if (defSchema) {
                 const jsDoc = getJSDoc(defSchema);
                 const defType = schemaToType(defSchema);
-                return [jsDoc, `type ${defsPrefix}__${defName} = ${defType};`].filter(Boolean).join('\n');
+                return [jsDoc, `type ${defsPrefix}__${defName.replace(/[^a-zA-Z0-9_$]/g, '_')} = ${defType};`]
+                    .filter(Boolean)
+                    .join('\n');
             }
             return '';
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.248",
+  "version": "0.0.1-draft.249",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -38,7 +38,7 @@
     "vovk": "^3.0.0-draft.241"
   },
   "optionalDependencies": {
-    "vovk-python": "^0.0.1-draft.40"
+    "vovk-python": "^0.0.1-draft.41"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",