@tantawowa/hosanna-tools 2.1.0 → 2.3.0
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 +3 -3
- package/dist/generation/generation-utils.js +4 -22
- package/dist/generation/generation-utils.js.map +1 -1
- package/dist/generation/import-utils.js +26 -15
- package/dist/generation/import-utils.js.map +1 -1
- package/dist/support-tools/dev-runner.js +57 -24
- package/dist/support-tools/dev-runner.js.map +1 -1
- package/package.json +4 -11
package/dist/build-info.json
CHANGED
|
@@ -133,28 +133,10 @@ async function cleanGeneratedFolder(generatedFolder, rootFolder) {
|
|
|
133
133
|
console.info('Generated folder does not exist, nothing to clean.');
|
|
134
134
|
}
|
|
135
135
|
else {
|
|
136
|
-
//
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
console.info('Generated folder is already empty.');
|
|
141
|
-
}
|
|
142
|
-
else {
|
|
143
|
-
for (const item of items) {
|
|
144
|
-
const itemPath = path.join(generatedFolder, item);
|
|
145
|
-
const stat = fs.statSync(itemPath);
|
|
146
|
-
if (stat.isDirectory()) {
|
|
147
|
-
if (!quiet)
|
|
148
|
-
console.info(`Deleting directory: ${itemPath}`);
|
|
149
|
-
fs.rmSync(itemPath, { recursive: true, force: true });
|
|
150
|
-
}
|
|
151
|
-
else {
|
|
152
|
-
if (!quiet)
|
|
153
|
-
console.info(`Deleting file: ${itemPath}`);
|
|
154
|
-
fs.unlinkSync(itemPath);
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
}
|
|
136
|
+
// Delete the entire generated folder
|
|
137
|
+
if (!quiet)
|
|
138
|
+
console.info(`Deleting entire generated folder: ${generatedFolder}`);
|
|
139
|
+
fs.rmSync(generatedFolder, { recursive: true, force: true });
|
|
158
140
|
}
|
|
159
141
|
// Also clean old-style generated files from src folder
|
|
160
142
|
const srcFolder = rootFolder || path.resolve(path.dirname(generatedFolder), 'src');
|
|
@@ -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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"}
|
|
@@ -133,9 +133,10 @@ function renderImports(usedImports, rootProjectPath, sourceAbsPath, exportedType
|
|
|
133
133
|
}
|
|
134
134
|
// Special handling for imports from generated struct files in RuntimeEmitter context
|
|
135
135
|
// This only applies when we're importing from generated files but the type is not a generated type
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
136
|
+
// Check both importInfo.path and moduleKey since getModuleKey may have converted the path
|
|
137
|
+
if ((importInfo.path.includes('-generated-struct') || moduleKey.includes('-generated-struct')) && importInfo.origin !== ImportOrigin.Generated) {
|
|
138
|
+
// Use moduleKey if it contains -generated-struct, otherwise use importInfo.path
|
|
139
|
+
const generatedStructPath = moduleKey.includes('-generated-struct') ? moduleKey : importInfo.path;
|
|
139
140
|
let sourceFilePath = '';
|
|
140
141
|
if (path.isAbsolute(generatedStructPath)) {
|
|
141
142
|
// Convert absolute generated struct path to source file path
|
|
@@ -146,17 +147,10 @@ function renderImports(usedImports, rootProjectPath, sourceAbsPath, exportedType
|
|
|
146
147
|
const absGeneratedPath = path.resolve(path.dirname(sourceAbsPath), generatedStructPath);
|
|
147
148
|
sourceFilePath = absGeneratedPath.replace('/src-generated/runtime', '/src').replace('-generated-struct', '').replace(/\.ts$/, '') + '.ts';
|
|
148
149
|
}
|
|
149
|
-
// Set moduleKey to the generated struct file path
|
|
150
|
-
if (path.isAbsolute(generatedStructPath)) {
|
|
151
|
-
moduleKey = path.relative(path.dirname(sourceAbsPath), generatedStructPath);
|
|
152
|
-
}
|
|
153
|
-
else {
|
|
154
|
-
moduleKey = generatedStructPath;
|
|
155
|
-
}
|
|
156
150
|
// Only import generated types from generated struct files
|
|
157
151
|
// Generated types are: _[Name]Struct, [Name]Struct, [Name] (function), [Name]State
|
|
158
152
|
const sourceFileName = path.basename(sourceFilePath, '.ts');
|
|
159
|
-
const viewName = sourceFileName; // e.g., '
|
|
153
|
+
const viewName = sourceFileName; // e.g., 'NativeVoiceTextEditBox'
|
|
160
154
|
const generatedTypeNames = new Set([
|
|
161
155
|
`${viewName}State`,
|
|
162
156
|
`${viewName}ViewStruct`,
|
|
@@ -165,7 +159,9 @@ function renderImports(usedImports, rootProjectPath, sourceAbsPath, exportedType
|
|
|
165
159
|
]);
|
|
166
160
|
if (!generatedTypeNames.has(importInfo.typeName)) {
|
|
167
161
|
// This is not a generated type, import from source file instead
|
|
168
|
-
|
|
162
|
+
const relativeToSrc = path.relative(rootProjectPath, sourceFilePath);
|
|
163
|
+
const hsSrcPath = relativeToSrc.startsWith('src/') ? relativeToSrc.substring(4) : relativeToSrc;
|
|
164
|
+
moduleKey = `@hs-src/${hsSrcPath}`;
|
|
169
165
|
}
|
|
170
166
|
}
|
|
171
167
|
if (!importsByModule.has(moduleKey)) {
|
|
@@ -229,9 +225,24 @@ function getModuleKey(importInfo, rootProjectPath, sourceAbsPath) {
|
|
|
229
225
|
__existsCache.set(generatedStructPath, exists);
|
|
230
226
|
}
|
|
231
227
|
if (exists) {
|
|
232
|
-
//
|
|
233
|
-
const
|
|
234
|
-
|
|
228
|
+
// Only import generated types (state + struct + factory) from generated struct files.
|
|
229
|
+
const viewName = path.basename(relativeToSrc);
|
|
230
|
+
const generatedTypeNames = new Set([
|
|
231
|
+
`${viewName}State`,
|
|
232
|
+
`${viewName}ViewStruct`,
|
|
233
|
+
`_${viewName}ViewStruct`,
|
|
234
|
+
viewName
|
|
235
|
+
]);
|
|
236
|
+
if (generatedTypeNames.has(importInfo.typeName)) {
|
|
237
|
+
// Import generated symbols from the generated struct
|
|
238
|
+
const relativeToGenerated = path
|
|
239
|
+
.relative(path.dirname(sourceAbsPath), generatedStructPath)
|
|
240
|
+
.replace(/\.ts$/, '');
|
|
241
|
+
return relativeToGenerated.startsWith('.') ? relativeToGenerated : './' + relativeToGenerated;
|
|
242
|
+
}
|
|
243
|
+
// For non-generated symbols (e.g. custom event interfaces), always import from the source file
|
|
244
|
+
const hsSrcPath = relativeToSrc.startsWith('src/') ? relativeToSrc.substring(4) : relativeToSrc;
|
|
245
|
+
return `@hs-src/${hsSrcPath}`;
|
|
235
246
|
}
|
|
236
247
|
else {
|
|
237
248
|
// Import from the source file
|
|
@@ -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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"}
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
@@ -7,7 +30,10 @@ exports.runDevProcesses = void 0;
|
|
|
7
30
|
const fs_1 = __importDefault(require("fs"));
|
|
8
31
|
const path_1 = __importDefault(require("path"));
|
|
9
32
|
const net_1 = __importDefault(require("net"));
|
|
10
|
-
const
|
|
33
|
+
const chokidar = __importStar(require("chokidar"));
|
|
34
|
+
const generation_utils_js_1 = require("../generation/generation-utils.js");
|
|
35
|
+
const struct_generator_js_1 = require("../generation/struct-generator.js");
|
|
36
|
+
const command_debugger_js_1 = require("./command-debugger.js");
|
|
11
37
|
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
|
12
38
|
const concurrently = require('concurrently');
|
|
13
39
|
function shouldStartProxy() {
|
|
@@ -26,21 +52,38 @@ async function runDevProcesses(options) {
|
|
|
26
52
|
var _a, _b, _c, _d, _e, _f;
|
|
27
53
|
// 1) Ensure initial generation completes before starting the dev server/debugger
|
|
28
54
|
console.info('[run] Performing initial generation...');
|
|
55
|
+
const rootFolder = path_1.default.resolve(process.cwd(), 'src');
|
|
56
|
+
const generatedFolder = path_1.default.resolve(process.cwd(), 'src-generated');
|
|
29
57
|
try {
|
|
30
|
-
|
|
58
|
+
// Set quiet mode for generation
|
|
59
|
+
process.env.HOSANNA_GENERATE_QUIET = '1';
|
|
60
|
+
(0, generation_utils_js_1.generateAll)(rootFolder, generatedFolder, { mode: struct_generator_js_1.GenerationMode.Runtime });
|
|
31
61
|
console.info('[run] Initial generation completed.');
|
|
32
62
|
}
|
|
33
|
-
catch (
|
|
34
|
-
console.error('[run] Initial generation failed. Aborting.');
|
|
63
|
+
catch (err) {
|
|
64
|
+
console.error('[run] Initial generation failed. Aborting.', err);
|
|
35
65
|
process.exit(1);
|
|
36
66
|
return;
|
|
37
67
|
}
|
|
38
|
-
// 2)
|
|
68
|
+
// 2) Start watch mode directly (non-blocking)
|
|
69
|
+
console.info('[generate] Initial generation completed. Watching for changes in ' + rootFolder + '...');
|
|
70
|
+
const watcher = chokidar.watch(rootFolder, {
|
|
71
|
+
persistent: true,
|
|
72
|
+
ignoreInitial: true,
|
|
73
|
+
ignored: /(^|[/\\])\../ // ignore dotfiles
|
|
74
|
+
});
|
|
75
|
+
const watchOptions = {
|
|
76
|
+
mode: struct_generator_js_1.GenerationMode.Runtime,
|
|
77
|
+
generatedFolder,
|
|
78
|
+
};
|
|
79
|
+
watcher.on('add', (filePath) => (0, generation_utils_js_1.debounceHandler)(generation_utils_js_1.handleFileChange)(filePath, generation_utils_js_1.ChangeType.Add, rootFolder, watchOptions));
|
|
80
|
+
watcher.on('change', (filePath) => (0, generation_utils_js_1.debounceHandler)(generation_utils_js_1.handleFileChange)(filePath, generation_utils_js_1.ChangeType.Change, rootFolder, watchOptions));
|
|
81
|
+
watcher.on('unlink', (filePath) => (0, generation_utils_js_1.debounceHandler)(generation_utils_js_1.handleFileChange)(filePath, generation_utils_js_1.ChangeType.Unlink, rootFolder, watchOptions));
|
|
82
|
+
// 3) Prepare commands for concurrently (only vite, since we run our own code directly)
|
|
39
83
|
const viteCmd = process.env.HOSANNA_VITE_CMD || 'npx vite';
|
|
40
84
|
const vitePort = Number((_b = (_a = options === null || options === void 0 ? void 0 : options.vitePort) !== null && _a !== void 0 ? _a : process.env.HOSANNA_VITE_PORT) !== null && _b !== void 0 ? _b : 5173);
|
|
41
85
|
const commands = [
|
|
42
86
|
{ command: `${viteCmd} --port ${vitePort}`, name: 'vite' },
|
|
43
|
-
{ command: 'hst generate --watch --quiet', name: 'generate', prefixColor: 'green' },
|
|
44
87
|
];
|
|
45
88
|
const startProxy = shouldStartProxy();
|
|
46
89
|
const webAppPort = (_c = options === null || options === void 0 ? void 0 : options.webAppPort) !== null && _c !== void 0 ? _c : 59151;
|
|
@@ -58,13 +101,15 @@ async function runDevProcesses(options) {
|
|
|
58
101
|
if (startProxy) {
|
|
59
102
|
console.info('[dev] Starting command debugger proxy...');
|
|
60
103
|
const defaultClientType = (_f = options === null || options === void 0 ? void 0 : options.defaultClientType) !== null && _f !== void 0 ? _f : 'web';
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
104
|
+
// Start debugger directly (non-blocking)
|
|
105
|
+
(0, command_debugger_js_1.startCommandDebugger)({
|
|
106
|
+
webAppPort,
|
|
107
|
+
deviceAppPort,
|
|
108
|
+
extensionPort,
|
|
109
|
+
defaultClientType,
|
|
65
110
|
});
|
|
66
111
|
}
|
|
67
|
-
//
|
|
112
|
+
// 4) Start readiness waiters in background
|
|
68
113
|
const readiness = [];
|
|
69
114
|
const viteReady = waitForPort(vitePort, '127.0.0.1', 60000)
|
|
70
115
|
.then(() => console.info(`[run] Web app ready: http://localhost:${vitePort}`))
|
|
@@ -89,7 +134,7 @@ async function runDevProcesses(options) {
|
|
|
89
134
|
console.info('[run] Dev services ready: generator (watch) and web app.');
|
|
90
135
|
}
|
|
91
136
|
});
|
|
92
|
-
//
|
|
137
|
+
// 6) Launch vite with concurrently (watch mode and debugger already running in this process)
|
|
93
138
|
concurrently(commands, {
|
|
94
139
|
prefix: 'name',
|
|
95
140
|
timestamps: false,
|
|
@@ -103,18 +148,6 @@ exports.runDevProcesses = runDevProcesses;
|
|
|
103
148
|
// ================================
|
|
104
149
|
// Helpers
|
|
105
150
|
// ================================
|
|
106
|
-
function runCommand(command, args) {
|
|
107
|
-
return new Promise((resolve, reject) => {
|
|
108
|
-
const child = (0, child_process_1.spawn)(command, args, { stdio: 'inherit', shell: true });
|
|
109
|
-
child.on('error', reject);
|
|
110
|
-
child.on('exit', (code) => {
|
|
111
|
-
if (code === 0)
|
|
112
|
-
resolve();
|
|
113
|
-
else
|
|
114
|
-
reject(new Error(`${command} ${args.join(' ')} exited with code ${code}`));
|
|
115
|
-
});
|
|
116
|
-
});
|
|
117
|
-
}
|
|
118
151
|
function waitForPort(port, host = '127.0.0.1', timeoutMs = 30000) {
|
|
119
152
|
const startedAt = Date.now();
|
|
120
153
|
return new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-runner.js","sourceRoot":"","sources":["../../src/support-tools/dev-runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dev-runner.js","sourceRoot":"","sources":["../../src/support-tools/dev-runner.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tantawowa/hosanna-tools",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.0",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"main": "dist/cli.js",
|
|
6
6
|
"types": "dist/cli.d.ts",
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"hst": "dist/cli.js"
|
|
13
13
|
},
|
|
14
14
|
"repository": {
|
|
15
|
-
"url": "https://github.com/Tantawowa/hosanna-
|
|
15
|
+
"url": "https://github.com/Tantawowa/hosanna-tools.git"
|
|
16
16
|
},
|
|
17
17
|
"scripts": {
|
|
18
18
|
"build": "rm -rf dist && tsc --project tsconfig.build.json && chmod +x dist/cli.js && mkdir -p dist/support-tools && cp src/support-tools/minimal-roku-app.zip dist/support-tools/ && node scripts/generateBuildInfo.js",
|
|
@@ -23,20 +23,13 @@
|
|
|
23
23
|
"lint-fix": "eslint --config eslint.config.mjs --ignore-pattern \"node_modules/**\" --ignore-pattern \"dist/**\" --ignore-pattern \"**/*.d.ts\" --ignore-pattern \"**/*.js\" --fix",
|
|
24
24
|
"lint-ide": "eslint --config eslint.config.mjs --ignore-pattern \"node_modules/**\" --ignore-pattern \"dist/**\" --ignore-pattern \"**/*.d.ts\" --ignore-pattern \"**/*.js\" --format compact",
|
|
25
25
|
"watch": "tsc --project tsconfig.build.json --watch & chokidar 'dist/cli.js' -c 'chmod +x dist/cli.js && node scripts/generateBuildInfo.js'",
|
|
26
|
-
"dev": "concurrently \"npm run watch\" \"vitest --watch --reporter=verbose\" \"npm run lint-ide\""
|
|
27
|
-
"changelog": "npx ai-changelog-generator --write",
|
|
28
|
-
"changelog:dry": "npx ai-changelog-generator --dry-run",
|
|
29
|
-
"gen": "node dist/cli.js generate",
|
|
30
|
-
"gen:types": "node dist/cli.js generate --mode types",
|
|
31
|
-
"gen:runtime": "node dist/cli.js generate --mode runtime",
|
|
32
|
-
"gen:both": "node dist/cli.js generate --mode both",
|
|
33
|
-
"gen:watch": "node dist/cli.js generate --watch"
|
|
26
|
+
"dev": "concurrently \"npm run watch\" \"vitest --watch --reporter=verbose\" \"npm run lint-ide\""
|
|
34
27
|
},
|
|
35
28
|
"devDependencies": {
|
|
29
|
+
"@tantawowa/hosanna-release-tool": "^0.12.0",
|
|
36
30
|
"@types/node": "^24.5.2",
|
|
37
31
|
"@types/readline-sync": "^1.4.8",
|
|
38
32
|
"@types/ws": "^8.5.10",
|
|
39
|
-
"ai-changelog-generator": "^0.2.0",
|
|
40
33
|
"chokidar-cli": "^3.0.0",
|
|
41
34
|
"eslint": "^9.17.0",
|
|
42
35
|
"eslint-formatter-compact": "^8.40.0",
|