@squidcloud/cli 1.0.407 → 1.0.409

package/dist/index.js

@@ -1000,10 +1000,28 @@ async function start() {
         await (0, shell_runner_1.runInShell)(`npm run start-squid`);
     }
     else {
-        const mainPath = path_1.default.resolve(modulePath, '../main.js');
+        // Detect if CLI is running as TypeScript (dev mode)
+        const isDevMode = __filename.endsWith('.ts');
+        let mainPath;
+        // In dev mode, try to use local-backend source files
+        if (isDevMode) {
+            const localBackendSrc = path_1.default.resolve(__dirname, '../../local-backend/src/main.ts');
+            try {
+                await fs.access(localBackendSrc);
+                mainPath = localBackendSrc;
+                console.log((0, logging_1.primary)('Dev mode detected:'), `using local-backend source files: ${mainPath}`);
+            }
+            catch (_) {
+                // Fall back to built version if source files not found
+                mainPath = path_1.default.resolve(modulePath, '../main.js');
+            }
+        }
+        else {
+            mainPath = path_1.default.resolve(modulePath, '../main.js');
+        }
         try {
             await fs.access(mainPath);
-            await (0, shell_runner_1.runInShell)(`npx nodemon --watch ./src --ext ts,js,json --quiet --exec node -r ts-node/register -r tsconfig-paths/register "${mainPath}"`);
+            await (0, shell_runner_1.runInShell)(`npx nodemon --watch ./src --watch ./.env --ext ts,js,json --quiet --exec node -r ts-node/register -r tsconfig-paths/register "${mainPath}"`);
         }
         catch (_) {
             (0, process_utils_1.exitWithError)(validate_1.INVALID_PROJECT_ERROR);
@@ -6047,6 +6065,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.INVALID_PROJECT_ERROR = void 0;
 exports.validateSquidProject = validateSquidProject;
 const promises_1 = __importDefault(__webpack_require__(1943));
+const process_env_utils_1 = __webpack_require__(9360);
 const process_utils_1 = __webpack_require__(8251);
 exports.INVALID_PROJECT_ERROR = 'Please make sure you are running this command in your Squid project directory';
 async function validateSquidProject() {
@@ -6054,7 +6073,9 @@ async function validateSquidProject() {
         const packageJson = await promises_1.default.readFile('package.json', 'utf8');
         const parsedJson = JSON.parse(packageJson);
         const { scripts } = parsedJson;
-        if (!scripts?.['start-squid'] && !scripts?.['start'].includes('squid start')) {
+        // Skip validation for connectors (when SQUID_CONNECTOR is set).
+        const isConnector = (0, process_env_utils_1.isEnvVarTruthy)('SQUID_CONNECTOR');
+        if (!isConnector && !scripts?.['start-squid'] && !scripts?.['start']?.includes('squid start')) {
             (0, process_utils_1.exitWithError)(exports.INVALID_PROJECT_ERROR);
         }
         return parsedJson;
@@ -22734,23 +22755,12 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.exitWithError = exitWithError;
-exports.isEnvVarTruthy = isEnvVarTruthy;
 const process = __importStar(__webpack_require__(932));
 /** Prints the error message into console.error() and calls process.exit(1). */
 function exitWithError(...messages) {
     console.error(...messages);
     process.exit(1);
 }
-/**
- * Checks if an environment variable is set to a truthy value.
- * Considers 'true' and '1' as truthy values.
- * @param variableName The name of the environment variable
- * @returns true if the variable is set to 'true' or '1', false otherwise
- */
-function isEnvVarTruthy(variableName) {
-    const value = process.env[variableName];
-    return value === 'true' || value === '1';
-}
 
 
 /***/ }),
@@ -22759,7 +22769,7 @@ function isEnvVarTruthy(variableName) {
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@squidcloud/cli","version":"1.0.407","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.407","copy-webpack-plugin":"^12.0.2","decompress":"^4.2.1","nodemon":"^3.1.3","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/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.409","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.409","copy-webpack-plugin":"^12.0.2","decompress":"^4.2.1","nodemon":"^3.1.3","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/decompress":"^4.2.7","@types/node":"^20.19.9","terminal-link":"^3.0.0"}}');
 
 /***/ }),
 
@@ -22885,6 +22895,7 @@ const fsSync = __importStar(__webpack_require__(9896));
 const fs_1 = __webpack_require__(9896);
 const path_1 = __importDefault(__webpack_require__(6928));
 const webpack_1 = __importDefault(__webpack_require__(6807));
+const process_env_utils_1 = __webpack_require__(9360);
 const resolve_1 = __webpack_require__(412);
 const tsoa_utils_1 = __webpack_require__(1431);
 const packageJson = __importStar(__webpack_require__(8330));
@@ -22912,7 +22923,7 @@ async function build({ verbose, dev, skipVersionCheck }) {
         console.log(`Starting Squid project build. CLI package version: ${packageJson.version}`);
     await (0, validate_1.validateSquidProject)();
     // Start version checks in the background if not disabled.
-    const shouldSkipVersionCheck = skipVersionCheck || (0, process_utils_1.isEnvVarTruthy)('SQUID_SKIP_BUILD_TIME_VERSION_CHECK');
+    const shouldSkipVersionCheck = skipVersionCheck || (0, process_env_utils_1.isEnvVarTruthy)('SQUID_SKIP_BUILD_TIME_VERSION_CHECK');
     // SQUID_CURRENT_CLI_VERSION_OVERRIDE is used for testing.
     const currentVersion = process.env['SQUID_CURRENT_CLI_VERSION_OVERRIDE'] || packageJson.version;
     const versionCheckPromise = shouldSkipVersionCheck ? Promise.resolve(undefined) : (0, version_check_1.checkCliVersion)(currentVersion);
@@ -22923,7 +22934,7 @@ async function build({ verbose, dev, skipVersionCheck }) {
         await fs_1.promises.rm(distPath, { recursive: true, force: true });
     }
     await fs_1.promises.mkdir(distPath);
-    const isSquidConnector = (0, process_utils_1.isEnvVarTruthy)('SQUID_CONNECTOR');
+    const isSquidConnector = (0, process_env_utils_1.isEnvVarTruthy)('SQUID_CONNECTOR');
     const openApiSpecAndControllers = await tsoa_utils_1.TsoaUtils.generateAllSpecs(false, !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);
@@ -24872,6 +24883,32 @@ module.exports = (string, columns, options) => {
 };
 
 
+/***/ }),
+
+/***/ 9360:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getProcessEnv = getProcessEnv;
+exports.isEnvVarTruthy = isEnvVarTruthy;
+const assertic_1 = __webpack_require__(3205);
+function getProcessEnv(key) {
+    return (0, assertic_1.truthy)(process.env[key], `No ${key} environment variable`);
+}
+/**
+ * Checks if an environment variable is set to a truthy value.
+ * Considers 'true' and '1' as truthy values.
+ * @param variableName The name of the environment variable
+ * @returns true if the variable is set to 'true' or '1', false otherwise
+ */
+function isEnvVarTruthy(variableName) {
+    const value = process.env[variableName];
+    return value === 'true' || value === '1';
+}
+
+
 /***/ }),
 
 /***/ 9386:

package/package.json

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