vovk-cli 0.0.1-draft.67 → 0.0.1-draft.69

package/dist/dev/ensureSchemaFiles.mjs

@@ -9,29 +9,39 @@ import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
 export default async function ensureSchemaFiles(projectInfo, schemaOutAbsolutePath, segmentNames) {
     const now = Date.now();
     let hasChanged = false;
-    const indexContent = `// auto-generated
+    const jsContent = `// auto-generated
 ${segmentNames
         .map((segmentName) => {
         return `module.exports['${segmentName}'] = require('./${segmentName || ROOT_SEGMENT_SCHEMA_NAME}.json');`;
     })
         .join('\n')}`;
     const dTsContent = `// auto-generated
-import type { VovkSchema } from 'vovk';
 declare const fullSchema: {
-${segmentNames.map((segmentName) => `  '${segmentName}': import('${segmentName}.json');`).join('\n')}
+${segmentNames.map((segmentName) => `  '${segmentName}': typeof import('./${segmentName || ROOT_SEGMENT_SCHEMA_NAME}.json');`).join('\n')}
 };
 export default fullSchema;`;
-    const jsAbsolutePath = path.join(schemaOutAbsolutePath, 'index.cjs');
-    const dTsAbsolutePath = path.join(schemaOutAbsolutePath, 'index.d.cts');
+    const tsContent = `// auto-generated
+${segmentNames.map((segmentName, i) => `import segment${i} from './${segmentName || ROOT_SEGMENT_SCHEMA_NAME}.json';`).join('\n')}
+const fullSchema = {
+${segmentNames.map((segmentName, i) => `  '${segmentName}': segment${i},`).join('\n')}
+};
+export default fullSchema;`;
+    const jsAbsolutePath = path.join(schemaOutAbsolutePath, 'main.cjs');
+    const dTsAbsolutePath = path.join(schemaOutAbsolutePath, 'main.d.cts');
+    const tsAbsolutePath = path.join(schemaOutAbsolutePath, 'index.ts');
     const existingJs = await fs.readFile(jsAbsolutePath, 'utf-8').catch(() => null);
     const existingDTs = await fs.readFile(dTsAbsolutePath, 'utf-8').catch(() => null);
+    const existingTs = await fs.readFile(tsAbsolutePath, 'utf-8').catch(() => null);
     await fs.mkdir(schemaOutAbsolutePath, { recursive: true });
-    if (existingJs !== indexContent) {
-        await fs.writeFile(jsAbsolutePath, indexContent);
+    if (existingJs !== jsContent) {
+        await fs.writeFile(jsAbsolutePath, jsContent);
     }
     if (existingDTs !== dTsContent) {
         await fs.writeFile(dTsAbsolutePath, dTsContent);
     }
+    if (existingTs !== tsContent) {
+        await fs.writeFile(tsAbsolutePath, tsContent);
+    }
     // Create JSON files (if not exist) with name [segmentName].json (where segmentName can include /, which means the folder structure can be nested)
     await Promise.all(segmentNames.map(async (segmentName) => {
         const { isCreated } = await writeOneSchemaFile({

package/dist/getProjectInfo/index.mjs

@@ -9,7 +9,7 @@ export default async function getProjectInfo({ port: givenPort, clientOutDir, cw
     const apiRoot = `${config.origin ?? ''}/${config.rootEntry}`;
     const apiDir = path.join(srcRoot, 'app', config.rootEntry);
     const schemaOutImportPath = path.relative(config.clientOutDir, config.schemaOutDir).replace(/\\/g, '/') + // windows fix
-        '/index.cjs';
+        '/main.cjs';
     const log = getLogger(config.logLevel);
     if (configAbsolutePaths.length > 1) {
         log.warn(`Multiple config files found. Using the first one: ${configAbsolutePaths[0]}`);

package/dist/index.mjs

@@ -83,7 +83,7 @@ program
     const { cwd, config, apiDir } = projectInfo;
     const segments = await locateSegments({ dir: apiDir, config });
     const schemaOutAbsolutePath = path.join(cwd, config.schemaOutDir);
-    const schemaImportUrl = pathToFileURL(path.join(schemaOutAbsolutePath, 'index.cjs')).href;
+    const schemaImportUrl = pathToFileURL(path.join(schemaOutAbsolutePath, 'main.cjs')).href;
     const { default: segmentsSchema } = (await import(schemaImportUrl));
     await generate({
         projectInfo,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.67",
+  "version": "0.0.1-draft.69",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -36,7 +36,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.66"
+    "vovk": "^3.0.0-draft.67"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.3.1",