declapract-typescript-ehmpathy 0.45.3 → 0.45.5

package/dist/practices/cicd-package/best-practice/.github/workflows/provision.yml

@@ -18,7 +18,7 @@ jobs:
   github:
     uses: ./.github/workflows/.declastruct.yml
     with:
-      wish-path: provision/github/declastruct.resources.ts
+      wish-path: provision/github.repo/resources.ts
       github-environment: prod
       creds-github-app-owner: ehmpathy
       creds-github-app-id: ${{ vars.DECLASTRUCT_GITHUB_CONFORMER_APP_ID }}

package/dist/practices/cicd-service/best-practice/.github/workflows/provision.yml

@@ -43,7 +43,7 @@ jobs:
   github:
     uses: ./.github/workflows/.declastruct.yml
     with:
-      wish-path: provision/github/declastruct.resources.ts
+      wish-path: provision/github.repo/resources.ts
       github-environment: prod
       creds-github-app-owner: ehmpathy
       creds-github-app-id: ${{ vars.DECLASTRUCT_GITHUB_CONFORMER_APP_ID }}

package/dist/practices/provision-github/bad-practices/old-declastruct-resources-path/provision/github/declastruct.resources.ts.declapract.ts

@@ -0,0 +1,7 @@
+import { FileCheckType, type FileFixFunction } from 'declapract';
+
+export const check = FileCheckType.EXISTS;
+
+export const fix: FileFixFunction = () => {
+  return { contents: null }; // delete old path, replaced by provision/github.repo/resources.ts
+};

package/dist/practices/typescript/bad-practices/relative-imports/src/<star><star>/<star>.ts.declapract.ts

@@ -54,18 +54,24 @@ export const fix: FileFixFunction = (contents, { relativeFilePath }) => {
   const pathParts = relativeFilePath.split('/');
   const srcIndex = pathParts.indexOf('src');
 
-  // replace relative imports with @src imports
+  // get the directories between src/ and the current file
+  const currentDirParts = pathParts.slice(srcIndex + 1, -1);
+
+  // replace relative imports with @src imports (only if they stay within src/)
   const fixed = contents.replace(
     /from\s+['"]((\.\.\/)+)(.*?)['"]/g,
     (match, dots, _, importPath) => {
       // count how many ../ we have
       const upCount = (dots.match(/\.\.\//g) || []).length;
 
-      // get the directories between src/ and the current file
-      const currentDirParts = pathParts.slice(srcIndex + 1, -1);
+      // if going up more levels than we have directories within src/, it goes OUTSIDE src
+      // leave these imports unchanged (e.g., ../../package.json from src/utils/index.ts)
+      if (upCount > currentDirParts.length) {
+        return match;
+      }
 
-      // if going up more levels than we have directories, just use @src/importPath
-      if (upCount >= currentDirParts.length) {
+      // if going up exactly as many levels as we have directories, target is at src root
+      if (upCount === currentDirParts.length) {
         return `from '@src/${importPath}'`;
       }
 

package/dist/practices/typescript/best-practice/package.json

@@ -9,7 +9,7 @@
   "scripts": {
     "build:clean": "rm dist/ -rf",
     "build:compile": "tsc -p ./tsconfig.build.json && tsc-alias -p ./tsconfig.build.json",
-    "build": "npm run build:clean && npm run build:compile && npm run build:artifact",
+    "build": "npm run build:clean && npm run build:compile && npm run build:complete --if-present && npm run build:artifact",
     "test:types": "tsc -p ./tsconfig.json --noEmit"
   }
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "declapract-typescript-ehmpathy",
   "author": "ehmpathy",
   "description": "declapract best practices declarations for typescript",
-  "version": "0.45.3",
+  "version": "0.45.5",
   "license": "MIT",
   "main": "src/index.js",
   "repository": "ehmpathy/declapract-typescript-ehmpathy",