vovk-cli 0.0.1-draft.163 → 0.0.1-draft.164

package/dist/generate/getClientTemplateFiles.mjs

@@ -2,7 +2,6 @@ import path from 'node:path';
 import { glob } from 'glob';
 import resolveAbsoluteModulePath from '../utils/resolveAbsoluteModulePath.mjs';
 import getFileSystemEntryType, { FileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
-import { checkIfInstalled } from '../utils/checkIfInstalled.mjs';
 export default async function getClientTemplateFiles({ config, cwd, log, configKey, cliGenerateOptions, }) {
     const usedTemplateDefs = {};
     const fromTemplates = configKey === 'fullClient'
@@ -23,30 +22,22 @@ export default async function getClientTemplateFiles({ config, cwd, log, configK
     }
     const templateFiles = [];
     const entries = Object.entries(usedTemplateDefs);
-    for (const [templateName, templateDef] of entries) {
-        if (templateDef.templatePath &&
-            !templateDef.templatePath.startsWith('.') &&
-            !templateDef.templatePath.startsWith('/')) {
-            const pathParts = templateDef.templatePath.split('/');
-            const npmModuleName = pathParts[0].startsWith('@') ? `${pathParts[0]}/${pathParts[1]}` : pathParts[0];
-            const isInstalled = checkIfInstalled(npmModuleName);
-            if (!isInstalled) {
-                log.error(`Template "${templateName}" requires the package "${npmModuleName}" to be installed.`);
-                return {
-                    fromTemplates: [],
-                    templateFiles: [],
-                };
-            }
-        }
-    }
     for (let i = 0; i < entries.length; i++) {
         const [templateName, templateDef, forceOutCwdRelativeDir] = entries[i];
         const templateAbsolutePath = templateDef.templatePath
             ? resolveAbsoluteModulePath(templateDef.templatePath, cwd)
             : null;
         const entryType = templateAbsolutePath ? await getFileSystemEntryType(templateAbsolutePath) : null;
-        if (templateAbsolutePath && !entryType)
-            throw new Error(`Unable to locate template path ${templateDef.templatePath} resolved as ${templateAbsolutePath}`);
+        if (templateAbsolutePath && !entryType) {
+            if (templateDef.templatePath &&
+                !templateDef.templatePath.startsWith('.') &&
+                !templateDef.templatePath.startsWith('/')) {
+                const pathParts = templateDef.templatePath.split('/');
+                const npmModuleName = pathParts[0].startsWith('@') ? `${pathParts[0]}/${pathParts[1]}` : pathParts[0];
+                throw new Error(`Unable to locate template path "${templateDef.templatePath}" resolved as "${templateAbsolutePath}". You may need to install the package "${npmModuleName}" first.`);
+            }
+            throw new Error(`Unable to locate template path "${templateDef.templatePath}" resolved as "${templateAbsolutePath}"`);
+        }
         const defOutDir = configKey === 'fullClient' ? templateDef.fullClient?.outDir : templateDef.segmentedClient?.outDir;
         let files = [];
         if (templateAbsolutePath) {

package/dist/getProjectInfo/getConfig/index.mjs

@@ -62,8 +62,8 @@ export default async function getConfig({ cliGenerateOptions, cliBundleOptions,
         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/templates/service.ts.ejs',
-            controller: 'vovk-cli/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/new/newSegment.mjs

@@ -24,7 +24,7 @@ ${isStaticSegment
   return generateStaticAPI(controllers);
 }`
         : ''}
-export const { GET, POST, PATCH, PUT, HEAD, OPTIONS, DELETE } = initVovk({
+export const { GET${isStaticSegment ? '' : ', POST, PATCH, PUT, HEAD, OPTIONS, DELETE'} } = initVovk({
 ${segmentName ? `  segmentName: '${segmentName}',\n` : ''}  emitSchema: true,
   controllers,
 });

package/package.json

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

package/dist/utils/checkIfInstalled.d.mts

@@ -1,12 +0,0 @@
-/**
- * Checks if a package is installed and available to be imported
- * @param packageName The name of the package to check
- * @returns A boolean indicating if the package is installed
- */
-export declare function checkIfInstalled(packageName: string): Promise<boolean>;
-/**
- * Synchronous version of checkIfInstalled
- * @param packageName The name of the package to check
- * @returns A boolean indicating if the package is installed
- */
-export declare function checkIfInstalledSync(packageName: string): boolean;

package/dist/utils/checkIfInstalled.mjs

@@ -1,33 +0,0 @@
-import { createRequire } from 'node:module';
-/**
- * Checks if a package is installed and available to be imported
- * @param packageName The name of the package to check
- * @returns A boolean indicating if the package is installed
- */
-export async function checkIfInstalled(packageName) {
-    try {
-        // Create a require function that works in ESM
-        const require = createRequire(import.meta.url);
-        require.resolve(packageName);
-        return true;
-    }
-    catch {
-        // If an error is thrown, the package is not installed or cannot be resolved
-        return false;
-    }
-}
-/**
- * Synchronous version of checkIfInstalled
- * @param packageName The name of the package to check
- * @returns A boolean indicating if the package is installed
- */
-export function checkIfInstalledSync(packageName) {
-    try {
-        const require = createRequire(import.meta.url);
-        require.resolve(packageName);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}