@t0.labs/daxta 0.4.1 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6,7 +6,7 @@ export declare function resolveJestConfigPath(cwd: string, options: {
6
6
  }): string | null;
7
7
  /**
8
8
  * Inject DAxTA as a Jest plugin (setup + reporter). Does not wrap the test process.
9
- * Leaves existing globalSetup / globalTeardown untouched.
9
+ * Supports JSON and JS/CJS/MJS/TS config files. Leaves globalSetup / globalTeardown untouched.
10
10
  */
11
11
  export declare function injectJestHooks(jestConfigPath: string, dryRun?: boolean): string[];
12
12
  /** Restore package.json script if it was wrapped as `daxta test --yes`. */
@@ -40,6 +40,8 @@ exports.unwrapDaxtaTestScript = unwrapDaxtaTestScript;
40
40
  const fs_1 = require("fs");
41
41
  const path = __importStar(require("path"));
42
42
  const discover_test_1 = require("./discover-test");
43
+ const SETUP = '@t0.labs/daxta/setup';
44
+ const REPORTER = '@t0.labs/daxta/jest-reporter';
43
45
  function loadJestJson(filePath) {
44
46
  return JSON.parse((0, fs_1.readFileSync)(filePath, 'utf8'));
45
47
  }
@@ -55,42 +57,147 @@ function resolveJestConfigPath(cwd, options) {
55
57
  }
56
58
  return null;
57
59
  }
58
- /**
59
- * Inject DAxTA as a Jest plugin (setup + reporter). Does not wrap the test process.
60
- * Leaves existing globalSetup / globalTeardown untouched.
61
- */
62
- function injectJestHooks(jestConfigPath, dryRun = false) {
60
+ function isJsonConfigPath(filePath) {
61
+ return path.extname(filePath).toLowerCase() === '.json';
62
+ }
63
+ function isJsLikeConfigPath(filePath) {
64
+ return ['.js', '.cjs', '.mjs', '.ts', '.cts', '.mts'].includes(path.extname(filePath).toLowerCase());
65
+ }
66
+ /** Find `[`…`]` for `key: [` while skipping strings. */
67
+ function findArrayPropRange(source, key) {
68
+ const re = new RegExp(`${key}\\s*:\\s*\\[`);
69
+ const match = re.exec(source);
70
+ if (!match)
71
+ return null;
72
+ const open = match.index + match[0].length - 1;
73
+ let depth = 0;
74
+ let quote = null;
75
+ let escaped = false;
76
+ for (let i = open; i < source.length; i += 1) {
77
+ const ch = source[i];
78
+ if (quote) {
79
+ if (escaped) {
80
+ escaped = false;
81
+ continue;
82
+ }
83
+ if (ch === '\\' && quote !== '`') {
84
+ escaped = true;
85
+ continue;
86
+ }
87
+ if (ch === quote)
88
+ quote = null;
89
+ continue;
90
+ }
91
+ if (ch === '"' || ch === "'" || ch === '`') {
92
+ quote = ch;
93
+ continue;
94
+ }
95
+ if (ch === '[')
96
+ depth += 1;
97
+ else if (ch === ']') {
98
+ depth -= 1;
99
+ if (depth === 0)
100
+ return { open, close: i };
101
+ }
102
+ }
103
+ return null;
104
+ }
105
+ function insertIntoObjectLiteral(source, propertyLine) {
106
+ const anchors = [/module\.exports\s*=\s*\{/, /export\s+default\s+\{/, /exports\s*=\s*\{/];
107
+ for (const re of anchors) {
108
+ const match = re.exec(source);
109
+ if (!match)
110
+ continue;
111
+ const brace = match.index + match[0].length - 1;
112
+ return `${source.slice(0, brace + 1)}\n ${propertyLine}${source.slice(brace + 1)}`;
113
+ }
114
+ return null;
115
+ }
116
+ function injectIntoJsSource(source) {
63
117
  const notes = [];
64
- if (!(0, fs_1.existsSync)(jestConfigPath))
65
- throw new Error(`Jest config not found: ${jestConfigPath}`);
66
- let data;
67
- try {
68
- data = loadJestJson(jestConfigPath);
118
+ let next = source;
119
+ if (!next.includes(SETUP)) {
120
+ const range = findArrayPropRange(next, 'setupFilesAfterEnv');
121
+ if (range) {
122
+ const afterOpen = next.slice(range.open + 1);
123
+ const multiline = /^\s*\n/.test(afterOpen);
124
+ const insertion = multiline ? `\n '${SETUP}',` : `'${SETUP}', `;
125
+ next = `${next.slice(0, range.open + 1)}${insertion}${multiline ? afterOpen : afterOpen.trimStart()}`;
126
+ notes.push(`setupFilesAfterEnv += ${SETUP}`);
127
+ }
128
+ else {
129
+ const inserted = insertIntoObjectLiteral(next, `setupFilesAfterEnv: ['${SETUP}'],`);
130
+ if (!inserted) {
131
+ throw new Error('Could not find setupFilesAfterEnv or module.exports / export default object to inject DAxTA setup');
132
+ }
133
+ next = inserted;
134
+ notes.push(`setupFilesAfterEnv = [${SETUP}]`);
135
+ }
69
136
  }
70
- catch {
71
- throw new Error(`Jest config must be JSON to inject DAxTA hooks: ${jestConfigPath}`);
137
+ if (!next.includes(REPORTER)) {
138
+ const range = findArrayPropRange(next, 'reporters');
139
+ if (range) {
140
+ const beforeClose = next.slice(range.open + 1, range.close);
141
+ const needsComma = beforeClose.trim().length > 0 && !/,\s*$/.test(beforeClose.trim());
142
+ const injection = `${needsComma ? ',' : ''}\n '${REPORTER}',\n `;
143
+ next = `${next.slice(0, range.close)}${injection}${next.slice(range.close)}`;
144
+ notes.push(`reporters += ${REPORTER}`);
145
+ }
146
+ else {
147
+ const inserted = insertIntoObjectLiteral(next, `reporters: ['default', '${REPORTER}'],`);
148
+ if (!inserted) {
149
+ throw new Error('Could not find reporters or module.exports / export default object to inject DAxTA reporter');
150
+ }
151
+ next = inserted;
152
+ notes.push(`reporters = [default, ${REPORTER}]`);
153
+ }
72
154
  }
155
+ return { source: next, notes };
156
+ }
157
+ function injectIntoJsonConfig(filePath, dryRun) {
158
+ const notes = [];
159
+ const data = loadJestJson(filePath);
73
160
  const setup = Array.isArray(data.setupFilesAfterEnv) ? [...data.setupFilesAfterEnv] : [];
74
- if (!setup.includes('@t0.labs/daxta/setup')) {
75
- setup.unshift('@t0.labs/daxta/setup');
161
+ if (!setup.includes(SETUP)) {
162
+ setup.unshift(SETUP);
76
163
  data.setupFilesAfterEnv = setup;
77
- notes.push('setupFilesAfterEnv += @t0.labs/daxta/setup');
164
+ notes.push(`setupFilesAfterEnv += ${SETUP}`);
78
165
  }
79
166
  const reporters = Array.isArray(data.reporters) ? [...data.reporters] : ['default'];
80
167
  const hasReporter = reporters.some((entry) => {
81
- if (entry === '@t0.labs/daxta/jest-reporter')
168
+ if (entry === REPORTER)
82
169
  return true;
83
- if (Array.isArray(entry) && entry[0] === '@t0.labs/daxta/jest-reporter')
170
+ if (Array.isArray(entry) && entry[0] === REPORTER)
84
171
  return true;
85
172
  return false;
86
173
  });
87
174
  if (!hasReporter) {
88
- reporters.push('@t0.labs/daxta/jest-reporter');
175
+ reporters.push(REPORTER);
89
176
  data.reporters = reporters;
90
- notes.push('reporters += @t0.labs/daxta/jest-reporter');
177
+ notes.push(`reporters += ${REPORTER}`);
91
178
  }
92
179
  if (!dryRun && notes.length) {
93
- (0, fs_1.writeFileSync)(jestConfigPath, `${JSON.stringify(data, null, 2)}\n`);
180
+ (0, fs_1.writeFileSync)(filePath, `${JSON.stringify(data, null, 2)}\n`);
181
+ }
182
+ return notes;
183
+ }
184
+ /**
185
+ * Inject DAxTA as a Jest plugin (setup + reporter). Does not wrap the test process.
186
+ * Supports JSON and JS/CJS/MJS/TS config files. Leaves globalSetup / globalTeardown untouched.
187
+ */
188
+ function injectJestHooks(jestConfigPath, dryRun = false) {
189
+ if (!(0, fs_1.existsSync)(jestConfigPath))
190
+ throw new Error(`Jest config not found: ${jestConfigPath}`);
191
+ if (isJsonConfigPath(jestConfigPath)) {
192
+ return injectIntoJsonConfig(jestConfigPath, dryRun);
193
+ }
194
+ if (!isJsLikeConfigPath(jestConfigPath)) {
195
+ throw new Error(`Unsupported Jest config type (${path.extname(jestConfigPath) || 'unknown'}). Use .json, .js, .cjs, .mjs, or .ts: ${jestConfigPath}`);
196
+ }
197
+ const original = (0, fs_1.readFileSync)(jestConfigPath, 'utf8');
198
+ const { source, notes } = injectIntoJsSource(original);
199
+ if (!dryRun && notes.length && source !== original) {
200
+ (0, fs_1.writeFileSync)(jestConfigPath, source);
94
201
  }
95
202
  return notes;
96
203
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@t0.labs/daxta",
3
- "version": "0.4.1",
3
+ "version": "0.4.2",
4
4
  "description": "DAxTA \u2014 docs from Nest integration traffic + DTO field CLI / Try-it",
5
5
  "license": "MIT",
6
6
  "repository": {