@expressots/cli 4.0.0-preview.2 → 4.0.0-preview.3

package/bin/utils/update-tsconfig-paths.js

@@ -51,30 +51,73 @@ function generatePathAlias(folderName) {
 }
 exports.generatePathAlias = generatePathAlias;
 /**
- * Parse JSONC (JSON with Comments) by stripping comments and trailing commas
+ * Parse JSONC (JSON with Comments) by stripping comments and trailing commas.
+ *
+ * Implemented as a small character scanner so we are correctly string-aware:
+ * comment-delimiter sequences (slash-star and star-slash) inside a JSON
+ * string literal — e.g. the very common "src" double-star slash "*.ts"
+ * include glob — must NOT be treated as comments. The previous regex-based
+ * stripper silently corrupted such globs into `src*.ts`, which then got
+ * persisted to disk by the structured rewriter.
+ *
  * Handles:
- * - Single-line comments (//)
- * - Multi-line comments
- * - Trailing commas (common in tsconfig.json)
+ * - Line comments (`//` to end of line)
+ * - Block comments (may span lines, may also be empty)
+ * - Trailing commas before `}` / `]`
+ * - JSON string escapes (`\"`, `\\`, etc.)
  *
  * @param content - The JSONC content
  * @returns Cleaned JSON string that can be parsed by JSON.parse
  */
 function stripJsonComments(content) {
-    let result = content;
-    // Remove multi-line comments first (they can span multiple lines)
-    result = result.replace(/\/\*[\s\S]*?\*\//g, "");
-    // Remove single-line comments (but not inside strings)
-    // This regex looks for // that are not inside strings
-    result = result.replace(/^(\s*)\/\/.*$/gm, "$1");
-    // Also handle inline comments after values
-    // Match: value, // comment or value // comment
-    result = result.replace(/,\s*\/\/.*$/gm, ",");
-    result = result.replace(/(["\d\w\]}\s])\s*\/\/.*$/gm, "$1");
-    // Remove trailing commas before } or ]
-    // This handles cases like: { "key": "value", }
-    result = result.replace(/,(\s*[}\]])/g, "$1");
-    return result;
+    let out = "";
+    let inString = false;
+    let escape = false;
+    for (let i = 0; i < content.length; i++) {
+        const ch = content[i];
+        const next = content[i + 1];
+        if (inString) {
+            out += ch;
+            if (escape) {
+                escape = false;
+            }
+            else if (ch === "\\") {
+                escape = true;
+            }
+            else if (ch === '"') {
+                inString = false;
+            }
+            continue;
+        }
+        if (ch === '"') {
+            inString = true;
+            out += ch;
+            continue;
+        }
+        if (ch === "/" && next === "/") {
+            // Line comment — skip until newline (newline is preserved).
+            i += 2;
+            while (i < content.length && content[i] !== "\n")
+                i++;
+            i--; // Loop will increment past this position.
+            continue;
+        }
+        if (ch === "/" && next === "*") {
+            // Block comment — skip until closing */. Replace with a single
+            // space so adjacent tokens don't fuse (e.g. `a/*x*/b` -> `a b`).
+            i += 2;
+            while (i < content.length &&
+                !(content[i] === "*" && content[i + 1] === "/")) {
+                i++;
+            }
+            i++; // Consume the closing '*' (loop increments past '/').
+            out += " ";
+            continue;
+        }
+        out += ch;
+    }
+    // Strip trailing commas before `}` / `]` (legal in JSONC, not in JSON).
+    return out.replace(/,(\s*[}\]])/g, "$1");
 }
 /**
  * Try to parse JSONC content, first stripping comments then parsing
@@ -122,15 +165,13 @@ function addPathAliasTextBased(content, aliasKey, aliasValue) {
     // Find compilerOptions to add paths object
     const compilerOptionsMatch = content.match(/"compilerOptions"\s*:\s*\{/);
     if (compilerOptionsMatch && compilerOptionsMatch.index !== undefined) {
-        // Check if baseUrl exists
-        const hasBaseUrl = /"baseUrl"\s*:/.test(content);
-        // Find the end of compilerOptions opening brace
+        // Find the end of compilerOptions opening brace.
+        // We don't inject `baseUrl` here on purpose — `paths` resolve
+        // relative to the tsconfig file when `baseUrl` is absent (TS 5+),
+        // which matches the v4 template convention.
         const insertPos = compilerOptionsMatch.index + compilerOptionsMatch[0].length;
-        let insertion = "\n";
-        if (!hasBaseUrl) {
-            insertion += '\t\t"baseUrl": ".",\n';
-        }
-        insertion += `\t\t"paths": {\n\t\t\t"${aliasKey}": ${JSON.stringify(aliasValue)}\n\t\t},`;
+        const insertion = "\n" +
+            `\t\t"paths": {\n\t\t\t"${aliasKey}": ${JSON.stringify(aliasValue)}\n\t\t},`;
         return (content.slice(0, insertPos) + insertion + content.slice(insertPos));
     }
     // Can't find compilerOptions, give up
@@ -170,13 +211,12 @@ async function updateTsconfigPaths(folderName, sourceRoot = "src") {
                     config.compilerOptions = {};
                 }
                 const compilerOptions = config.compilerOptions;
-                // Ensure baseUrl is set (required for paths to work)
-                if (!compilerOptions.baseUrl) {
-                    compilerOptions.baseUrl = ".";
-                }
-                // Determine the correct path value based on baseUrl
-                // If baseUrl is "./src" or "src", paths should be relative to src
-                // If baseUrl is ".", paths should include the full path from root
+                // Determine the correct path value based on baseUrl. When
+                // `baseUrl` is absent (the TS 7-friendly default the v4
+                // templates ship) `paths` resolve relative to the tsconfig
+                // file itself — same effective behaviour as `baseUrl: "."`.
+                // We deliberately do NOT inject `baseUrl` here; doing so
+                // would silently undo the template's intentional removal.
                 const baseUrl = compilerOptions.baseUrl || ".";
                 const isBaseUrlSrc = baseUrl === `./${sourceRoot}` || baseUrl === sourceRoot;
                 const aliasValue = isBaseUrlSrc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expressots/cli",
-  "version": "4.0.0-preview.2",
+  "version": "4.0.0-preview.3",
   "description": "Expressots CLI - modern, fast, lightweight nodejs web framework (@cli)",
   "author": "Richard Zampieri",
   "license": "MIT",
@@ -41,32 +41,35 @@
     "clean": "node scripts/rm.js bin",
     "prepublish": "npm run build && npm pack",
     "format": "prettier --write \"./src/**/*.ts\" --cache",
-    "lint": "eslint \"./src/**/*.ts\"",
-    "lint:fix": "eslint \"./src/**/*.ts\" --fix",
+    "lint": "eslint \"./src/**/*.ts\" --cache --cache-location node_modules/.cache/eslint/",
+    "lint:fix": "eslint \"./src/**/*.ts\" --fix --cache --cache-location node_modules/.cache/eslint/",
     "release": "release-it",
+    "release:prepare": "node scripts/release/prepare-publish.mjs",
+    "release:restore": "node scripts/release/restore-package-json.mjs",
+    "release:publish": "npm run build && npm run release:prepare && npm publish --tag next --access public && npm run release:restore",
     "test": "jest",
     "coverage": "jest --coverage",
     "test:watch": "jest --watch"
   },
   "dependencies": {
+    "@expressots/shared": "^4.0.0-preview.3",
+    "chalk": "4.1.2",
     "cli-progress": "3.12.0",
-    "cli-table3": "0.6.5",
     "cross-spawn": "7.0.6",
     "degit": "2.8.4",
     "glob": "13.0.6",
-    "inquirer": "8.2.6",
-		"mustache": "4.2.0",
-		"ora": "5.4.1",
+    "inquirer": "^8.2.7",
+    "mustache": "4.2.0",
+    "ora": "5.4.1",
     "semver": "7.6.3",
     "ts-node": "10.9.2",
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@codecov/vite-plugin": "0.0.1-beta.9",
+    "@codecov/vite-plugin": "^2.0.1",
     "@commitlint/cli": "19.2.1",
     "@commitlint/config-conventional": "19.1.0",
-    "@expressots/shared": "file:../shared/expressots-shared-4.0.0-preview.1.tgz",
-    "@release-it/conventional-changelog": "7.0.2",
+    "@release-it/conventional-changelog": "^11.0.0",
     "@types/cli-progress": "3.11.0",
     "@types/cross-spawn": "6.0.6",
     "@types/degit": "2.8.3",
@@ -77,20 +80,26 @@
     "@types/yargs": "17.0.22",
     "@typescript-eslint/eslint-plugin": "7.6.0",
     "@typescript-eslint/parser": "7.6.0",
-    "chalk": "4.1.2",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "husky": "9.0.11",
     "jest": "^29.7.0",
+    "lint-staged": "^15.2.10",
     "prettier": "3.2.5",
     "reflect-metadata": "0.2.2",
-    "release-it": "16.3.0",
+    "release-it": "^20.0.1",
     "shx": "0.3.4",
     "ts-jest": "^29.2.5",
     "tsx": "^4.19.2",
     "typescript": "5.2.2"
   },
-	"release-it": {
+  "lint-staged": {
+    "src/**/*.ts": [
+      "eslint --cache --cache-location node_modules/.cache/eslint/ --fix",
+      "prettier --write --cache"
+    ]
+  },
+  "release-it": {
     "git": {
       "commitMessage": "chore: release ${version}"
     },