@squidcloud/cli 1.0.418 → 1.0.419

package/dist/index.js

@@ -577,6 +577,13 @@ exports.requirePath = void 0;
 exports.findModulePath = findModulePath;
 const enhanced_resolve_1 = __importDefault(__webpack_require__(4506));
 const path_1 = __importDefault(__webpack_require__(6928));
+/**
+ * Finds the resolved path of a given module by searching upward through directory tree.
+ *
+ * @param moduleName - The name of the module to find (e.g., '@squidcloud/local-backend')
+ * @param startDir - The directory to start searching from (defaults to process.cwd())
+ * @returns Promise resolving to the absolute path of the module, or null if not found
+ */
 async function findModulePath(moduleName, startDir = process.cwd()) {
     const directoriesToSearch = new Set([startDir, process.cwd(), __dirname]);
     // Try each directory in order
@@ -607,6 +614,12 @@ async function findModulePath(moduleName, startDir = process.cwd()) {
     }
     return null;
 }
+/**
+ * Requires a module file, handling both Node.js and webpack environments.
+ *
+ * @param file - The path to the module file to require
+ * @returns The exported module content
+ */
 const requirePath = (file) => {
     return  false ? 0 : require(file);
 };
@@ -2961,6 +2974,9 @@ class TsoaUtils {
             if (!supportsDefault && specName === 'default') {
                 continue;
             }
+            if (verbose) {
+                console.log(`Processing config file: ${file}`);
+            }
             // Use native join to create the folder.
             const outputDir = path.join('dist', specName);
             if (!fs.existsSync(outputDir)) {
@@ -2992,6 +3008,33 @@ class TsoaUtils {
             config.routes = config.routes || {};
             config.spec.outputDirectory = outputDir;
             config.routes.routesDir = outputDir;
+            // Fix middlewareTemplate path when using fallback from local-backend
+            if (config.routes.middlewareTemplate && !path.isAbsolute(file)) {
+                const localBackendModule = await (0, resolve_1.findModulePath)('@squidcloud/local-backend');
+                if (verbose) {
+                    console.log(`File being processed: ${file}`);
+                    console.log(`Local backend module: ${localBackendModule}`);
+                    console.log(`Original middlewareTemplate: ${config.routes.middlewareTemplate}`);
+                }
+                if (localBackendModule) {
+                    // Check if the file is from the local-backend package (it would contain node_modules/@squidcloud/local-backend)
+                    if (file.includes('@squidcloud/local-backend') && file.includes('tsoa.json')) {
+                        // Find package root (the module path points to index.js)
+                        // Example module path: .../node_modules/@squidcloud/local-backend/dist/local-backend/src/index.js
+                        // Next, we need to go up 4 levels (dist/local-backend/src/index.js) to reach: 'local-backend' root dir.
+                        const packageRoot = path.resolve(localBackendModule, '..', '..', '..', '..');
+                        // Rewrite the middlewareTemplate path to be relative to the current working directory.
+                        const templatePath = path.resolve(packageRoot, 'dist/local-backend/openapi-template.hbs');
+                        // Calculate relative path from current working directory (which might be backend/ or test-tsoa/backend/)
+                        config.routes.middlewareTemplate = path.relative(process.cwd(), templatePath);
+                        if (verbose) {
+                            console.log(`Rewritten middlewareTemplate path to: ${config.routes.middlewareTemplate}`);
+                            console.log(`Template absolute path: ${templatePath}`);
+                            console.log(`Package root: ${packageRoot}`);
+                        }
+                    }
+                }
+            }
             // Use a relative path for the temporary config file.
             const tempConfigPath = `temp-tsoa-config-${specName}.json`;
             try {
@@ -23433,7 +23476,7 @@ exports.INTEGRATION_TYPES = [
     'a2a',
     'legend',
     'teams',
-    'ollama',
+    'openai_compatible',
 ];
 /**
  * @category Database
@@ -30559,7 +30602,7 @@ function exitWithError(...messages) {
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@squidcloud/cli","version":"1.0.418","description":"The Squid CLI","main":"dist/index.js","scripts":{"start":"node dist/index.js","start-ts":"ts-node -r tsconfig-paths/register src/index.ts","prebuild":"rimraf dist","build":"webpack --mode=production","build:dev":"webpack --mode=development","lint":"eslint","link":"npm run build && chmod 755 dist/index.js && npm link","watch":"webpack --watch","deploy":"npm run build && npm pack --silent | xargs -I {} mv {} package.tgz && npm install -g package.tgz && rm -rf package.tgz","publish:public":"npm run build && npm publish --access public"},"files":["dist/**/*"],"bin":{"squid":"dist/index.js"},"keywords":[],"author":"","license":"ISC","engines":{"node":">=18.0.0"},"dependencies":{"@squidcloud/local-backend":"^1.0.418","adm-zip":"^0.5.16","copy-webpack-plugin":"^12.0.2","decompress":"^4.2.1","nodemon":"^3.1.9","terser-webpack-plugin":"^5.3.10","ts-loader":"^9.5.1","ts-node":"^10.9.2","tsconfig-paths":"^4.2.0","tsconfig-paths-webpack-plugin":"^4.1.0","webpack":"^5.101.3","zip-webpack-plugin":"^4.0.1"},"devDependencies":{"@types/adm-zip":"^0.5.7","@types/decompress":"^4.2.7","@types/node":"^20.19.9","terminal-link":"^3.0.0"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@squidcloud/cli","version":"1.0.419","description":"The Squid CLI","main":"dist/index.js","scripts":{"start":"node dist/index.js","start-ts":"ts-node -r tsconfig-paths/register src/index.ts","prebuild":"rimraf dist","build":"webpack --mode=production","build:dev":"webpack --mode=development","lint":"eslint","link":"npm run build && chmod 755 dist/index.js && npm link","watch":"webpack --watch","deploy":"npm run build && npm pack --silent | xargs -I {} mv {} package.tgz && npm install -g package.tgz && rm -rf package.tgz","publish:public":"npm run build && npm publish --access public"},"files":["dist/**/*"],"bin":{"squid":"dist/index.js"},"keywords":[],"author":"","license":"ISC","engines":{"node":">=18.0.0"},"dependencies":{"@squidcloud/local-backend":"^1.0.419","adm-zip":"^0.5.16","copy-webpack-plugin":"^12.0.2","decompress":"^4.2.1","nodemon":"^3.1.9","terser-webpack-plugin":"^5.3.10","ts-loader":"^9.5.1","ts-node":"^10.9.2","tsconfig-paths":"^4.2.0","tsconfig-paths-webpack-plugin":"^4.1.0","webpack":"^5.101.3","zip-webpack-plugin":"^4.0.1"},"devDependencies":{"@types/adm-zip":"^0.5.7","@types/decompress":"^4.2.7","@types/node":"^20.19.9","terminal-link":"^3.0.0"}}');
 
 /***/ }),
 
@@ -31041,7 +31084,7 @@ async function build({ verbose, dev, skipVersionCheck }) {
     }
     await fs_1.promises.mkdir(distPath);
     const isSquidConnector = (0, process_env_utils_1.isEnvVarTruthy)('SQUID_CONNECTOR');
-    const openApiSpecAndControllers = await tsoa_utils_1.TsoaUtils.generateAllSpecs(false, !isSquidConnector);
+    const openApiSpecAndControllers = await tsoa_utils_1.TsoaUtils.generateAllSpecs(verbose, !isSquidConnector);
     await fs_1.promises.writeFile(path_1.default.join(distPath, '', 'openapi-spec-and-controllers.json'), JSON.stringify(openApiSpecAndControllers));
     const isUserConfigMode = fsSync.existsSync(resolve_2.USER_WEBPACK_CONFIG_PATH);
     const webpackConfigPath = isUserConfigMode ? resolve_2.USER_WEBPACK_CONFIG_PATH : resolve_2.BUILT_IN_WEBPACK_CONFIG_PATH;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squidcloud/cli",
-  "version": "1.0.418",
+  "version": "1.0.419",
   "description": "The Squid CLI",
   "main": "dist/index.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@squidcloud/local-backend": "^1.0.418",
+    "@squidcloud/local-backend": "^1.0.419",
     "adm-zip": "^0.5.16",
     "copy-webpack-plugin": "^12.0.2",
     "decompress": "^4.2.1",