declapract-typescript-ehmpathy 0.47.48 → 0.47.49

package/dist/practices/directory-structure-src/bad-practices/data-dir/src/<star><star>/data/<star><star>/<star>.declapract.ts

@@ -0,0 +1,19 @@
+import { FileCheckType, type FileFixFunction } from 'declapract';
+
+// if files exist in any /data/, this is a bad practice
+export const check = FileCheckType.EXISTS;
+
+export const fix: FileFixFunction = (contents, context) => {
+  // move any /data/dao/* to /access/daos/*
+  // move any /data/clients/* to /access/sdks/*
+  // move other /data/* to /access/*
+  const newPath = context.relativeFilePath
+    .replace(/\/data\/dao\//g, '/access/daos/')
+    .replace(/\/data\/clients\//g, '/access/sdks/')
+    .replace(/\/data\//g, '/access/');
+
+  return {
+    contents: contents ?? null,
+    relativeFilePath: newPath,
+  };
+};

package/dist/practices/directory-structure-src/bad-practices/domain-dir/src/<star><star>/domain/<star><star>/<star>.declapract.ts

@@ -0,0 +1,17 @@
+import { FileCheckType, type FileFixFunction } from 'declapract';
+
+// if files exist in any /domain/, this is a bad practice
+export const check = FileCheckType.EXISTS;
+
+export const fix: FileFixFunction = (contents, context) => {
+  // move any /domain/objects/* to /domain.objects/*
+  // move any /domain/* to /domain.objects/*
+  const newPath = context.relativeFilePath
+    .replace(/\/domain\/objects\//g, '/domain.objects/')
+    .replace(/\/domain\//g, '/domain.objects/');
+
+  return {
+    contents: contents ?? null,
+    relativeFilePath: newPath,
+  };
+};

package/dist/practices/directory-structure-src/bad-practices/logic-dir/src/{logic → <star><star>/logic}/<star><star>/<star>.declapract.ts

@@ -3,13 +3,13 @@ import { FileCheckType, type FileFixFunction } from 'declapract';
 export const check = FileCheckType.EXISTS;
 
 /**
- * .what = moves any file from src/logic/ to src/domain.operations/
+ * .what = moves any file from any /logic/ to /domain.operations/
  * .why = ensures all files are moved, not just .ts files — prevents silent data loss for hidden paths
  */
 export const fix: FileFixFunction = (contents, context) => {
   const newPath = context.relativeFilePath.replace(
-    'src/logic/',
-    'src/domain.operations/',
+    /\/logic\//g,
+    '/domain.operations/',
   );
 
   return {

package/dist/practices/directory-structure-src/bad-practices/model-dir/src/{model/<star><star>/<star>.ts.declapract.ts → <star><star>/model/<star><star>/<star>.declapract.ts}

@@ -10,7 +10,7 @@ export const fix: FileFixFunction = (contents, context) => {
         "export * from './';",
       ) ?? null,
     relativeFilePath: context.relativeFilePath
-      .replace('src/model/domainObjects/', 'src/domain.objects/')
-      .replace('src/model/', 'src/domain.objects/'),
+      .replace(/\/model\/domainObjects\//g, '/domain.objects/')
+      .replace(/\/model\//g, '/domain.objects/'),
   };
 };

package/dist/practices/directory-structure-src/bad-practices/nonpublished-modules-dir/src/__nonpublished_modules__/<star><star>/<star>.declapract.ts

@@ -0,0 +1,17 @@
+import { FileCheckType, type FileFixFunction } from 'declapract';
+
+// if files exist in __nonpublished_modules__/, this is a bad practice
+export const check = FileCheckType.EXISTS;
+
+export const fix: FileFixFunction = (contents, context) => {
+  // move any /__nonpublished_modules__/ to /_topublish/
+  const newPath = context.relativeFilePath.replace(
+    /__nonpublished_modules__\//g,
+    '_topublish/',
+  );
+
+  return {
+    contents: contents ?? null,
+    relativeFilePath: newPath,
+  };
+};

package/dist/practices/directory-structure-src/bad-practices/old-import-paths/src/<star><star>/<star>.ts.declapract.ts

@@ -8,6 +8,9 @@ const OLD_PATH_PATTERNS = [
   /from\s+['"][^'"]*\/domain\/objects/,
   /from\s+['"][^'"]*\/domain\//,
   /from\s+['"][^'"]*\/logic\//,
+  /from\s+['"][^'"]*\/model\/domainObjects/,
+  /from\s+['"][^'"]*\/model\//,
+  /from\s+['"][^'"]*\/services\//,
 ];
 
 export const check: FileCheckFunction = (contents) => {
@@ -35,7 +38,12 @@ export const fix: FileFixFunction = (contents) => {
     .replace(/(['"])([^'"]*?)\/domain\/objects\b/g, '$1$2/domain.objects')
     .replace(/(['"])([^'"]*?)\/domain\//g, '$1$2/domain.objects/')
     // logic layer fixes
-    .replace(/(['"])([^'"]*?)\/logic\//g, '$1$2/domain.operations/');
+    .replace(/(['"])([^'"]*?)\/logic\//g, '$1$2/domain.operations/')
+    // model layer fixes (old structure before domain.objects)
+    .replace(/(['"])([^'"]*?)\/model\/domainObjects\b/g, '$1$2/domain.objects')
+    .replace(/(['"])([^'"]*?)\/model\//g, '$1$2/domain.objects/')
+    // services layer fixes (services = business logic, not service clients)
+    .replace(/(['"])([^'"]*?)\/services\//g, '$1$2/domain.operations/');
 
   return { contents: fixed };
 };

package/dist/practices/directory-structure-src/bad-practices/services-dir/src/<star><star>/services/<star><star>/<star>.declapract.ts

@@ -0,0 +1,16 @@
+import { FileCheckType, type FileFixFunction } from 'declapract';
+
+export const check = FileCheckType.EXISTS; // if a file exists with this path pattern, then it's bad practice
+
+export const fix: FileFixFunction = (contents, context) => {
+  // move any /services/* to /domain.operations/* (services = business logic)
+  const newPath = context.relativeFilePath.replace(
+    /\/services\//g,
+    '/domain.operations/',
+  );
+
+  return {
+    contents: contents ?? null,
+    relativeFilePath: newPath,
+  };
+};

package/package.json

@@ -2,7 +2,7 @@
   "name": "declapract-typescript-ehmpathy",
   "author": "ehmpathy",
   "description": "declapract best practices declarations for typescript",
-  "version": "0.47.48",
+  "version": "0.47.49",
   "license": "MIT",
   "main": "src/index.js",
   "repository": "ehmpathy/declapract-typescript-ehmpathy",
@@ -75,11 +75,11 @@
     "esbuild-register": "3.6.0",
     "husky": "8.0.3",
     "jest": "30.2.0",
-    "rhachet": "1.37.14",
+    "rhachet": "1.37.16",
     "rhachet-brains-anthropic": "0.3.3",
-    "rhachet-roles-bhrain": "0.17.1",
-    "rhachet-roles-bhuild": "0.13.8",
-    "rhachet-roles-ehmpathy": "1.27.11",
+    "rhachet-roles-bhrain": "0.20.0",
+    "rhachet-roles-bhuild": "0.14.2",
+    "rhachet-roles-ehmpathy": "1.27.16",
     "tsc-alias": "1.8.10",
     "tsx": "4.20.6",
     "type-fns": "0.8.1",

package/dist/practices/directory-structure-src/bad-practices/data-dir/src/data/<star><star>/<star>.ts.declapract.ts

@@ -1,19 +0,0 @@
-import { FileCheckType, type FileFixFunction } from 'declapract';
-
-// if files exist in src/data/, this is a bad practice
-export const check = FileCheckType.EXISTS;
-
-export const fix: FileFixFunction = (contents, context) => {
-  // move src/data/dao/* to src/access/daos/*
-  // move src/data/clients/* to src/access/sdks/*
-  // move other src/data/* to src/access/*
-  const newPath = context.relativeFilePath
-    .replace('src/data/dao/', 'src/access/daos/')
-    .replace('src/data/clients/', 'src/access/sdks/')
-    .replace('src/data/', 'src/access/');
-
-  return {
-    contents,
-    relativeFilePath: newPath,
-  };
-};

package/dist/practices/directory-structure-src/bad-practices/domain-dir/src/domain/<star><star>/<star>.ts.declapract.ts

@@ -1,17 +0,0 @@
-import { FileCheckType, type FileFixFunction } from 'declapract';
-
-// if files exist in src/domain/, this is a bad practice
-export const check = FileCheckType.EXISTS;
-
-export const fix: FileFixFunction = (contents, context) => {
-  // move src/domain/objects/* to src/domain.objects/*
-  // move src/domain/* to src/domain.objects/*
-  const newPath = context.relativeFilePath
-    .replace('src/domain/objects/', 'src/domain.objects/')
-    .replace('src/domain/', 'src/domain.objects/');
-
-  return {
-    contents,
-    relativeFilePath: newPath,
-  };
-};

package/dist/practices/directory-structure-src/bad-practices/services-dir/src/services/<star><star>/<star>.ts.declapract.ts

@@ -1,3 +0,0 @@
-import { FileCheckType } from 'declapract';
-
-export const check = FileCheckType.EXISTS; // if a file exists with this path pattern, then it's bad practice

package/dist/practices/tests/bad-practices/unquoted-shell-vars-in-test-scripts/package.json

@@ -1,5 +0,0 @@
-{
-  "scripts": {
-    "test:unit": "@declapract{check.exists}"
-  }
-}

package/dist/practices/tests/bad-practices/unquoted-shell-vars-in-test-scripts/package.json.declapract.ts

@@ -1,70 +0,0 @@
-import type { FileCheckFunction, FileFixFunction } from 'declapract';
-
-/**
- * .what = detects unsafe shell variable references in test scripts
- *
- * .why = unsafe shell variables cause bugs:
- *        - unquoted `[ -n $VAR ]` becomes `[ -n ]` when VAR is unset → returns TRUE
- *        - quoted `[ -n "$VAR" ]` fails with `set -u` (unbound variable error)
- *        - both caused CI issues: snapshots silently passed or workflows failed
- *
- * .pattern:
- *   - bad:  `$([ -n $RESNAP ] && ...)`        (unquoted)
- *   - bad:  `$([ -n "$RESNAP" ] && ...)`      (quoted without default)
- *   - good: `$([ -n "${RESNAP:-}" ] && ...)`  (quoted with default)
- */
-
-const VARS = ['RESNAP', 'THOROUGH', 'CI', 'ECHO'];
-
-const UNSAFE_VAR_PATTERNS = VARS.flatMap((v) => [
-  // unquoted: [ -n $VAR ] or [ -z $VAR ]
-  new RegExp(`\\[ -n \\$${v} \\]`, 'g'),
-  new RegExp(`\\[ -z \\$${v} \\]`, 'g'),
-  // quoted without default: [ -n "$VAR" ] or [ -z "$VAR" ]
-  // in JSON this appears as: [ -n \"$VAR\" ] or [ -z \"$VAR\" ]
-  // but NOT [ -n "${VAR:-}" ] (the safe form)
-  new RegExp(`\\[ -n \\\\"\\$${v}\\\\" \\]`, 'g'),
-  new RegExp(`\\[ -z \\\\"\\$${v}\\\\" \\]`, 'g'),
-]);
-
-export const check: FileCheckFunction = (contents) => {
-  if (!contents) throw new Error('no contents');
-
-  // check if any unsafe patterns exist
-  const hasUnsafeVars = UNSAFE_VAR_PATTERNS.some((pattern) =>
-    pattern.test(contents),
-  );
-
-  if (hasUnsafeVars) return; // bad practice detected
-  throw new Error('no unsafe shell variables found');
-};
-
-export const fix: FileFixFunction = (contents) => {
-  if (!contents) return { contents };
-
-  let fixed = contents;
-
-  // fix all unsafe patterns to use ${VAR:-} syntax
-  for (const v of VARS) {
-    // unquoted → quoted with default
-    fixed = fixed.replace(
-      new RegExp(`\\[ -n \\$${v} \\]`, 'g'),
-      `[ -n "\${${v}:-}" ]`,
-    );
-    fixed = fixed.replace(
-      new RegExp(`\\[ -z \\$${v} \\]`, 'g'),
-      `[ -z "\${${v}:-}" ]`,
-    );
-    // quoted without default → quoted with default (JSON-escaped quotes)
-    fixed = fixed.replace(
-      new RegExp(`\\[ -n \\\\"\\$${v}\\\\" \\]`, 'g'),
-      `[ -n \\"\${${v}:-}\\" ]`,
-    );
-    fixed = fixed.replace(
-      new RegExp(`\\[ -z \\\\"\\$${v}\\\\" \\]`, 'g'),
-      `[ -z \\"\${${v}:-}\\" ]`,
-    );
-  }
-
-  return { contents: fixed };
-};