@tantawowa/hosanna-tools 2.3.0 → 2.4.1
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.
package/dist/build-info.json
CHANGED
|
@@ -138,8 +138,16 @@ async function cleanGeneratedFolder(generatedFolder, rootFolder) {
|
|
|
138
138
|
console.info(`Deleting entire generated folder: ${generatedFolder}`);
|
|
139
139
|
fs.rmSync(generatedFolder, { recursive: true, force: true });
|
|
140
140
|
}
|
|
141
|
+
// Also clean src-generated folder if it exists (in case a different generatedFolder was specified)
|
|
142
|
+
const projectRoot = path.dirname(generatedFolder);
|
|
143
|
+
const srcGeneratedFolder = path.join(projectRoot, 'src-generated');
|
|
144
|
+
if (fs.existsSync(srcGeneratedFolder) && srcGeneratedFolder !== generatedFolder) {
|
|
145
|
+
if (!quiet)
|
|
146
|
+
console.info(`Deleting src-generated folder: ${srcGeneratedFolder}`);
|
|
147
|
+
fs.rmSync(srcGeneratedFolder, { recursive: true, force: true });
|
|
148
|
+
}
|
|
141
149
|
// Also clean old-style generated files from src folder
|
|
142
|
-
const srcFolder = rootFolder || path.resolve(
|
|
150
|
+
const srcFolder = rootFolder || path.resolve(projectRoot, 'src');
|
|
143
151
|
if (!quiet)
|
|
144
152
|
console.info(`Cleaning old-style generated files from ${srcFolder}...`);
|
|
145
153
|
if (fs.existsSync(srcFolder)) {
|
|
@@ -173,7 +181,6 @@ async function cleanGeneratedFolder(generatedFolder, rootFolder) {
|
|
|
173
181
|
console.info(`Source folder ${srcFolder} does not exist, skipping old-style cleanup.`);
|
|
174
182
|
}
|
|
175
183
|
// Also clean legacy files from the project root (where generatedFolder is located)
|
|
176
|
-
const projectRoot = path.dirname(generatedFolder);
|
|
177
184
|
const rootLegacyFiles = [
|
|
178
185
|
path.join(projectRoot, 'AsyncManagerCommands.ts')
|
|
179
186
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generation-utils.js","sourceRoot":"","sources":["../../src/generation/generation-utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generation-utils.js","sourceRoot":"","sources":["../../src/generation/generation-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -132,7 +132,7 @@ function renderImports(usedImports, rootProjectPath, sourceAbsPath, exportedType
|
|
|
132
132
|
moduleKey = `@hs-src/${relativeToSrc}`;
|
|
133
133
|
}
|
|
134
134
|
// Special handling for imports from generated struct files in RuntimeEmitter context
|
|
135
|
-
// This
|
|
135
|
+
// This applies when importing from generated files (locally-defined types have origin = Source)
|
|
136
136
|
// Check both importInfo.path and moduleKey since getModuleKey may have converted the path
|
|
137
137
|
if ((importInfo.path.includes('-generated-struct') || moduleKey.includes('-generated-struct')) && importInfo.origin !== ImportOrigin.Generated) {
|
|
138
138
|
// Use moduleKey if it contains -generated-struct, otherwise use importInfo.path
|
|
@@ -163,6 +163,18 @@ function renderImports(usedImports, rootProjectPath, sourceAbsPath, exportedType
|
|
|
163
163
|
const hsSrcPath = relativeToSrc.startsWith('src/') ? relativeToSrc.substring(4) : relativeToSrc;
|
|
164
164
|
moduleKey = `@hs-src/${hsSrcPath}`;
|
|
165
165
|
}
|
|
166
|
+
else {
|
|
167
|
+
// This IS a generated type, ensure moduleKey is a relative path to the generated struct file
|
|
168
|
+
// Determine the absolute path to the generated struct file
|
|
169
|
+
const absGeneratedStructPath = path.isAbsolute(generatedStructPath)
|
|
170
|
+
? generatedStructPath
|
|
171
|
+
: path.resolve(path.dirname(sourceAbsPath), generatedStructPath);
|
|
172
|
+
// Convert absolute path to relative path from sourceAbsPath
|
|
173
|
+
const relativeToGenerated = path
|
|
174
|
+
.relative(path.dirname(sourceAbsPath), absGeneratedStructPath)
|
|
175
|
+
.replace(/\.ts$/, '');
|
|
176
|
+
moduleKey = relativeToGenerated.startsWith('.') ? relativeToGenerated : './' + relativeToGenerated;
|
|
177
|
+
}
|
|
166
178
|
}
|
|
167
179
|
if (!importsByModule.has(moduleKey)) {
|
|
168
180
|
importsByModule.set(moduleKey, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-utils.js","sourceRoot":"","sources":["../../src/generation/import-utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"import-utils.js","sourceRoot":"","sources":["../../src/generation/import-utils.ts"],"names":[],"mappings":"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"}
|