@embeddables/cli 0.14.4 → 0.15.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/.prompts/custom/build-funnel.md +1 -1
- package/.prompts/embeddables-cli.md +79 -39
- package/.prompts/short-rule-body.md +15 -0
- package/README.md +42 -0
- package/dist/auth/index.d.ts +27 -0
- package/dist/auth/index.d.ts.map +1 -1
- package/dist/auth/index.js +44 -0
- package/dist/auth/index.js.map +1 -1
- package/dist/cli.js +29 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +3 -253
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/login.d.ts +2 -0
- package/dist/commands/login.d.ts.map +1 -1
- package/dist/commands/login.js +41 -1
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/provide-otp.d.ts +11 -0
- package/dist/commands/provide-otp.d.ts.map +1 -0
- package/dist/commands/provide-otp.js +102 -0
- package/dist/commands/provide-otp.js.map +1 -0
- package/dist/commands/update-project-files.d.ts +8 -0
- package/dist/commands/update-project-files.d.ts.map +1 -0
- package/dist/commands/update-project-files.js +236 -0
- package/dist/commands/update-project-files.js.map +1 -0
- package/dist/commands/upgrade.d.ts.map +1 -1
- package/dist/commands/upgrade.js +16 -0
- package/dist/commands/upgrade.js.map +1 -1
- package/dist/compiler/parsePage.js +14 -9
- package/dist/compiler/parsePage.js.map +1 -1
- package/dist/compiler/reverse.d.ts.map +1 -1
- package/dist/compiler/reverse.js +17 -8
- package/dist/compiler/reverse.js.map +1 -1
- package/dist/components/primitives/CustomHTML.d.ts +2 -1
- package/dist/components/primitives/CustomHTML.d.ts.map +1 -1
- package/dist/components/primitives/CustomHTML.js +11 -2
- package/dist/components/primitives/CustomHTML.js.map +1 -1
- package/dist/helpers/json.d.ts.map +1 -1
- package/dist/helpers/json.js +132 -17
- package/dist/helpers/json.js.map +1 -1
- package/dist/prompts/branches.d.ts.map +1 -1
- package/dist/prompts/branches.js +2 -0
- package/dist/prompts/branches.js.map +1 -1
- package/dist/types-builder.d.ts +5 -2
- package/dist/types-builder.d.ts.map +1 -1
- package/dist/workbench/AutofillPanel.d.ts.map +1 -1
- package/dist/workbench/AutofillPanel.js +52 -14
- package/dist/workbench/AutofillPanel.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,236 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { fileURLToPath } from 'node:url';
|
|
4
|
+
import { writeTypeStubs } from '../helpers/typeStubs.js';
|
|
5
|
+
import { renderDefaultTagStylesCss } from '../constants/defaultTagStylesV4.js';
|
|
6
|
+
import * as stdout from '../stdout.js';
|
|
7
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
8
|
+
const __dirname = path.dirname(__filename);
|
|
9
|
+
/** Strip the first YAML frontmatter block (--- ... ---) from content. Returns body only, or full content if no frontmatter. */
|
|
10
|
+
function stripFrontmatter(content) {
|
|
11
|
+
const open = content.startsWith('---\n');
|
|
12
|
+
if (!open)
|
|
13
|
+
return content;
|
|
14
|
+
const afterFirst = content.indexOf('\n---', 4);
|
|
15
|
+
if (afterFirst === -1)
|
|
16
|
+
return content;
|
|
17
|
+
return content.slice(afterFirst + 4).replace(/^\n/, '');
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Updates all project scaffold files (gitignore, AI/editor rules, type stubs, tsconfig, etc.)
|
|
21
|
+
* without touching project configuration (embeddables.json).
|
|
22
|
+
*
|
|
23
|
+
* Called by both `init` (full project setup) and `upgrade` (refresh files after CLI update).
|
|
24
|
+
*/
|
|
25
|
+
export function updateProjectFiles(cwd) {
|
|
26
|
+
const gitignorePath = path.join(cwd, '.gitignore');
|
|
27
|
+
const embeddablesDir = path.join(cwd, 'embeddables');
|
|
28
|
+
// Create or update .gitignore
|
|
29
|
+
const gitignoreEntries = ['**/.generated/', 'node_modules/', '.DS_Store'];
|
|
30
|
+
const embeddablesBlock = `# Embeddables\n${gitignoreEntries.join('\n')}\n`;
|
|
31
|
+
let existingGitignore = '';
|
|
32
|
+
if (fs.existsSync(gitignorePath)) {
|
|
33
|
+
existingGitignore = fs.readFileSync(gitignorePath, 'utf8');
|
|
34
|
+
}
|
|
35
|
+
const embeddablesSectionRegex = /# Embeddables\n(?:[^\n]*\n)*?(?=\n#|\n\n|$)/;
|
|
36
|
+
if (embeddablesSectionRegex.test(existingGitignore)) {
|
|
37
|
+
const updated = existingGitignore.replace(embeddablesSectionRegex, embeddablesBlock);
|
|
38
|
+
if (updated !== existingGitignore) {
|
|
39
|
+
fs.writeFileSync(gitignorePath, updated, 'utf8');
|
|
40
|
+
stdout.success('Updated .gitignore');
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
stdout.dim(' ✓ .gitignore already configured');
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
const separator = existingGitignore && !existingGitignore.endsWith('\n') ? '\n' : '';
|
|
48
|
+
const content = existingGitignore
|
|
49
|
+
? `${existingGitignore}${separator}\n${embeddablesBlock}`
|
|
50
|
+
: embeddablesBlock;
|
|
51
|
+
fs.writeFileSync(gitignorePath, content, 'utf8');
|
|
52
|
+
stdout.success(existingGitignore ? 'Updated .gitignore' : 'Created .gitignore');
|
|
53
|
+
}
|
|
54
|
+
// Create embeddables directory
|
|
55
|
+
if (!fs.existsSync(embeddablesDir)) {
|
|
56
|
+
fs.mkdirSync(embeddablesDir, { recursive: true });
|
|
57
|
+
stdout.success('Created embeddables/ directory');
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
stdout.dim(' ✓ embeddables/ directory exists');
|
|
61
|
+
}
|
|
62
|
+
// Create default-styles.css in project root for standard tag defaults
|
|
63
|
+
const defaultStylesPath = path.join(cwd, 'default-styles.css');
|
|
64
|
+
if (!fs.existsSync(defaultStylesPath)) {
|
|
65
|
+
fs.writeFileSync(defaultStylesPath, renderDefaultTagStylesCss(), 'utf8');
|
|
66
|
+
stdout.success('Created default-styles.css');
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
stdout.dim(' ✓ default-styles.css already exists');
|
|
70
|
+
}
|
|
71
|
+
// Remove old .claudefiles folder (replaced by .cursor/ and .claude/)
|
|
72
|
+
const claudefilesDir = path.join(cwd, '.claudefiles');
|
|
73
|
+
if (fs.existsSync(claudefilesDir)) {
|
|
74
|
+
fs.rmSync(claudefilesDir, { recursive: true });
|
|
75
|
+
stdout.success('Removed old .claudefiles/');
|
|
76
|
+
}
|
|
77
|
+
// Inject AI/editor rules using the shared-README pattern:
|
|
78
|
+
// full content → embeddables/AI-README.md; short pointer → four rule file surfaces.
|
|
79
|
+
// All files are generated dynamically — no pre-built files are shipped with the package.
|
|
80
|
+
const packageRoot = path.resolve(__dirname, '..', '..');
|
|
81
|
+
const promptsSource = path.join(packageRoot, '.prompts', 'embeddables-cli.md');
|
|
82
|
+
const shortBodySource = path.join(packageRoot, '.prompts', 'short-rule-body.md');
|
|
83
|
+
/**
|
|
84
|
+
* Returns the short pointer body from .prompts/short-rule-body.md.
|
|
85
|
+
* Throws if the file is absent rather than falling back to a hardcoded string — a missing
|
|
86
|
+
* source file means the package is broken and init should fail loudly, not silently emit
|
|
87
|
+
* files with a path that may not resolve correctly for every rule surface.
|
|
88
|
+
*
|
|
89
|
+
* NOTE on path resolution: the body uses `embeddables/AI-README.md` as a project-root-
|
|
90
|
+
* relative path. All four rule surfaces (Cursor, Claude, Antigravity, Codex) instruct
|
|
91
|
+
* the AI to read that path and AI tools resolve it from the workspace root, not from the
|
|
92
|
+
* rule file's own location — so the same path string is correct regardless of nesting depth.
|
|
93
|
+
*/
|
|
94
|
+
function readShortBody() {
|
|
95
|
+
if (!fs.existsSync(shortBodySource)) {
|
|
96
|
+
throw new Error(`Missing required file: ${shortBodySource} — re-install @embeddables/cli or run \`npm install\``);
|
|
97
|
+
}
|
|
98
|
+
return fs.readFileSync(shortBodySource, 'utf8');
|
|
99
|
+
}
|
|
100
|
+
// Rule injection is skipped entirely when promptsSource is absent to avoid creating
|
|
101
|
+
// pointer files that reference a non-existent embeddables/AI-README.md.
|
|
102
|
+
if (fs.existsSync(promptsSource)) {
|
|
103
|
+
const fullContent = fs.readFileSync(promptsSource, 'utf8');
|
|
104
|
+
// Write the full guide (frontmatter stripped) to embeddables/AI-README.md
|
|
105
|
+
fs.writeFileSync(path.join(embeddablesDir, 'AI-README.md'), stripFrontmatter(fullContent), 'utf8');
|
|
106
|
+
stdout.success('Wrote embeddables/AI-README.md');
|
|
107
|
+
// Read short pointer body once — reused across all four rule file surfaces
|
|
108
|
+
const shortBody = readShortBody();
|
|
109
|
+
// .cursor/rules/embeddables-cli.md — globs: is intentionally empty; alwaysApply is the active setting
|
|
110
|
+
const cursorRulesDir = path.join(cwd, '.cursor', 'rules');
|
|
111
|
+
fs.mkdirSync(cursorRulesDir, { recursive: true });
|
|
112
|
+
fs.writeFileSync(path.join(cursorRulesDir, 'embeddables-cli.md'), `---\nglobs:\nalwaysApply: true\n---\n\n` + shortBody, 'utf8');
|
|
113
|
+
stdout.success('Injected .cursor/ rules');
|
|
114
|
+
// .claude/CLAUDE.md (read by Claude Code natively)
|
|
115
|
+
// .claude/embeddables-cli.md (retained for backward compat with earlier installs)
|
|
116
|
+
// Both files contain the same short pointer body so all surfaces stay in sync.
|
|
117
|
+
const claudeDir = path.join(cwd, '.claude');
|
|
118
|
+
fs.mkdirSync(claudeDir, { recursive: true });
|
|
119
|
+
fs.writeFileSync(path.join(claudeDir, 'CLAUDE.md'), shortBody, 'utf8');
|
|
120
|
+
fs.writeFileSync(path.join(claudeDir, 'embeddables-cli.md'), shortBody, 'utf8');
|
|
121
|
+
stdout.success('Injected .claude/');
|
|
122
|
+
// .agent/rules/embeddables-cli.md (Antigravity/Windsurf)
|
|
123
|
+
const agentRulesDir = path.join(cwd, '.agent', 'rules');
|
|
124
|
+
fs.mkdirSync(agentRulesDir, { recursive: true });
|
|
125
|
+
fs.writeFileSync(path.join(agentRulesDir, 'embeddables-cli.md'), `---\nglobs:\nalwaysOn: true\n---\n\n` + shortBody, 'utf8');
|
|
126
|
+
stdout.success('Injected .agent/ rules (Antigravity)');
|
|
127
|
+
// AGENTS.md (Codex) — lives in the project root; uses the same short pointer body
|
|
128
|
+
fs.writeFileSync(path.join(cwd, 'AGENTS.md'), shortBody, 'utf8');
|
|
129
|
+
stdout.success('Injected AGENTS.md (Codex)');
|
|
130
|
+
}
|
|
131
|
+
// Create tsconfig.json for editor support (JSX, type checking)
|
|
132
|
+
const tsconfigPath = path.join(cwd, 'tsconfig.json');
|
|
133
|
+
if (!fs.existsSync(tsconfigPath)) {
|
|
134
|
+
const tsconfig = {
|
|
135
|
+
compilerOptions: {
|
|
136
|
+
target: 'esnext',
|
|
137
|
+
module: 'esnext',
|
|
138
|
+
moduleResolution: 'bundler',
|
|
139
|
+
jsx: 'react-jsx',
|
|
140
|
+
noEmit: true,
|
|
141
|
+
strict: false,
|
|
142
|
+
skipLibCheck: true,
|
|
143
|
+
esModuleInterop: true,
|
|
144
|
+
baseUrl: '.',
|
|
145
|
+
paths: {
|
|
146
|
+
'react/jsx-runtime': ['./.types/react-jsx-runtime.d.ts'],
|
|
147
|
+
'@embeddables/cli/components': ['./.types/components.d.ts'],
|
|
148
|
+
'@embeddables/cli/types': ['./.types/types.d.ts'],
|
|
149
|
+
},
|
|
150
|
+
},
|
|
151
|
+
include: ['embeddables'],
|
|
152
|
+
};
|
|
153
|
+
fs.writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2) + '\n', 'utf8');
|
|
154
|
+
stdout.success('Created tsconfig.json');
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
stdout.dim(' ✓ tsconfig.json already exists');
|
|
158
|
+
}
|
|
159
|
+
// Migrate .types from old location (embeddables/.types/) to project root (.types/)
|
|
160
|
+
const oldTypesDir = path.join(embeddablesDir, '.types');
|
|
161
|
+
if (fs.existsSync(oldTypesDir)) {
|
|
162
|
+
fs.rmSync(oldTypesDir, { recursive: true });
|
|
163
|
+
stdout.success('Removed old embeddables/.types/');
|
|
164
|
+
}
|
|
165
|
+
// Ensure tsconfig has baseUrl and paths for type resolution
|
|
166
|
+
if (fs.existsSync(tsconfigPath)) {
|
|
167
|
+
let tsconfigContent = fs.readFileSync(tsconfigPath, 'utf8');
|
|
168
|
+
let updated = false;
|
|
169
|
+
// Migrate old embeddables/.types/ location → .types/
|
|
170
|
+
if (tsconfigContent.includes('./embeddables/.types/')) {
|
|
171
|
+
tsconfigContent = tsconfigContent.replaceAll('./embeddables/.types/', './.types/');
|
|
172
|
+
updated = true;
|
|
173
|
+
}
|
|
174
|
+
// Migrate old .types/types-builder → .types/types
|
|
175
|
+
if (tsconfigContent.includes('./.types/types-builder')) {
|
|
176
|
+
tsconfigContent = tsconfigContent.replace(/\.\/\.types\/types-builder(\.d\.ts)?"/g, './.types/types.d.ts"');
|
|
177
|
+
updated = true;
|
|
178
|
+
}
|
|
179
|
+
// Migrate paths without .d.ts extension → with .d.ts
|
|
180
|
+
const extensionless = [
|
|
181
|
+
['./.types/react-jsx-runtime"', './.types/react-jsx-runtime.d.ts"'],
|
|
182
|
+
['./.types/components"', './.types/components.d.ts"'],
|
|
183
|
+
['./.types/types"', './.types/types.d.ts"'],
|
|
184
|
+
];
|
|
185
|
+
for (const [old, replacement] of extensionless) {
|
|
186
|
+
if (tsconfigContent.includes(old) && !tsconfigContent.includes(replacement)) {
|
|
187
|
+
tsconfigContent = tsconfigContent.replaceAll(old, replacement);
|
|
188
|
+
updated = true;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
// Add baseUrl and paths if missing entirely
|
|
192
|
+
try {
|
|
193
|
+
const tsconfig = JSON.parse(tsconfigContent);
|
|
194
|
+
const co = tsconfig.compilerOptions ?? {};
|
|
195
|
+
let coUpdated = false;
|
|
196
|
+
if (!co.baseUrl) {
|
|
197
|
+
co.baseUrl = '.';
|
|
198
|
+
coUpdated = true;
|
|
199
|
+
}
|
|
200
|
+
const requiredPaths = {
|
|
201
|
+
'react/jsx-runtime': ['./.types/react-jsx-runtime.d.ts'],
|
|
202
|
+
'@embeddables/cli/components': ['./.types/components.d.ts'],
|
|
203
|
+
'@embeddables/cli/types': ['./.types/types.d.ts'],
|
|
204
|
+
};
|
|
205
|
+
if (!co.paths)
|
|
206
|
+
co.paths = {};
|
|
207
|
+
for (const [key, value] of Object.entries(requiredPaths)) {
|
|
208
|
+
if (!co.paths[key]) {
|
|
209
|
+
co.paths[key] = value;
|
|
210
|
+
coUpdated = true;
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
if (coUpdated) {
|
|
214
|
+
tsconfig.compilerOptions = co;
|
|
215
|
+
tsconfigContent = JSON.stringify(tsconfig, null, 2) + '\n';
|
|
216
|
+
updated = true;
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
catch {
|
|
220
|
+
// If tsconfig isn't valid JSON (e.g. has comments), fall through to string-based updates above
|
|
221
|
+
}
|
|
222
|
+
if (updated) {
|
|
223
|
+
fs.writeFileSync(tsconfigPath, tsconfigContent, 'utf8');
|
|
224
|
+
stdout.success('Updated tsconfig.json');
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
// Remove old .types/types-builder.d.ts (now named .types/types.d.ts)
|
|
228
|
+
const legacyTypesBuilderDts = path.join(cwd, '.types', 'types-builder.d.ts');
|
|
229
|
+
if (fs.existsSync(legacyTypesBuilderDts)) {
|
|
230
|
+
fs.rmSync(legacyTypesBuilderDts);
|
|
231
|
+
}
|
|
232
|
+
// Generate type declaration stubs for editor support (no npm install needed)
|
|
233
|
+
writeTypeStubs(cwd);
|
|
234
|
+
stdout.success('Generated type declarations');
|
|
235
|
+
}
|
|
236
|
+
//# sourceMappingURL=update-project-files.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-project-files.js","sourceRoot":"","sources":["../../src/commands/update-project-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"AAmCA,wBAAsB,UAAU,kBAkF/B"}
|
package/dist/commands/upgrade.js
CHANGED
|
@@ -7,6 +7,8 @@ import { captureException, createLogger, exit } from '../logger.js';
|
|
|
7
7
|
import { getSentryContextFromProjectConfig, setSentryContext, setSentryUserFromAuth, setSentryUserFromAuthCache, } from '../sentry-context.js';
|
|
8
8
|
import * as stdout from '../stdout.js';
|
|
9
9
|
import { withSpan } from '../tracing.js';
|
|
10
|
+
import { readProjectConfig } from '../config/index.js';
|
|
11
|
+
import { updateProjectFiles } from './update-project-files.js';
|
|
10
12
|
const require = createRequire(import.meta.url);
|
|
11
13
|
function getCurrentVersion() {
|
|
12
14
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
@@ -60,6 +62,20 @@ export async function runUpgrade() {
|
|
|
60
62
|
title: 'Upgrade complete',
|
|
61
63
|
});
|
|
62
64
|
stdout.gap();
|
|
65
|
+
// Refresh project scaffold files (AI rules, type stubs, etc.) if inside an embeddables project
|
|
66
|
+
try {
|
|
67
|
+
const config = readProjectConfig();
|
|
68
|
+
if (config) {
|
|
69
|
+
stdout.step('Updating project files…');
|
|
70
|
+
updateProjectFiles(process.cwd());
|
|
71
|
+
stdout.gap();
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
catch (updateError) {
|
|
75
|
+
const msg = updateError instanceof Error ? updateError.message : String(updateError);
|
|
76
|
+
stdout.warn(`Could not update project files: ${msg}`);
|
|
77
|
+
stdout.dim(' Run "embeddables init --yes" to update manually.');
|
|
78
|
+
}
|
|
63
79
|
}
|
|
64
80
|
catch (error) {
|
|
65
81
|
Sentry.metrics.count('cli.upgrade.failed', 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnE,OAAO,EACL,iCAAiC,EACjC,gBAAgB,EAChB,qBAAqB,EACrB,0BAA0B,GAC3B,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"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"}
|
|
@@ -242,8 +242,10 @@ function jsxToTree(el, constEnv, filePath, validationFunctionSource) {
|
|
|
242
242
|
(c.type === 'JSXText' && c.value.trim().length > 0) ||
|
|
243
243
|
c.type === 'JSXExpressionContainer');
|
|
244
244
|
if (hasChildren) {
|
|
245
|
-
// Convert JSX children to HTML string
|
|
246
|
-
|
|
245
|
+
// Convert JSX children to HTML string.
|
|
246
|
+
// When preserve_json_in_cli is set, string expressions are raw HTML (no escaping).
|
|
247
|
+
const preserveJsonInCli = attrs.preserve_json_in_cli === true;
|
|
248
|
+
const htmlString = jsxChildrenToHTML(el.children, constEnv, filePath, false, preserveJsonInCli).trim();
|
|
247
249
|
attrs.text = htmlString;
|
|
248
250
|
}
|
|
249
251
|
// Return with empty children array since we've converted them to HTML
|
|
@@ -474,8 +476,9 @@ function loc(file, node) {
|
|
|
474
476
|
* Converts JSX children to HTML string.
|
|
475
477
|
* Handles JSXElements, JSXText, JSXExpressions, and JSXFragments.
|
|
476
478
|
* @param preserveWhitespace If true, preserves all whitespace (for <style> and <script> tags)
|
|
479
|
+
* @param preserveJsonInCli If true, string expressions are raw HTML (no escaping) — for CustomHTML with preserve_json_in_cli
|
|
477
480
|
*/
|
|
478
|
-
function jsxChildrenToHTML(children, constEnv, filePath, preserveWhitespace = false) {
|
|
481
|
+
function jsxChildrenToHTML(children, constEnv, filePath, preserveWhitespace = false, preserveJsonInCli = false) {
|
|
479
482
|
let html = '';
|
|
480
483
|
for (const child of children) {
|
|
481
484
|
if (child.type === 'JSXElement') {
|
|
@@ -484,9 +487,10 @@ function jsxChildrenToHTML(children, constEnv, filePath, preserveWhitespace = fa
|
|
|
484
487
|
else if (child.type === 'JSXText') {
|
|
485
488
|
const text = child.value;
|
|
486
489
|
// For <style> and <script> tags, preserve all whitespace
|
|
487
|
-
// For other tags, skip whitespace-only text (
|
|
490
|
+
// For other tags, skip whitespace-only text (likely indentation); otherwise preserve as-is
|
|
491
|
+
// to avoid removing spaces between HTML tags/content (CLI-92: revert trim regression)
|
|
488
492
|
if (preserveWhitespace || text.trim().length > 0) {
|
|
489
|
-
html += escapeHTML(text);
|
|
493
|
+
html += preserveJsonInCli ? text : escapeHTML(text);
|
|
490
494
|
}
|
|
491
495
|
}
|
|
492
496
|
else if (child.type === 'JSXExpressionContainer') {
|
|
@@ -494,10 +498,11 @@ function jsxChildrenToHTML(children, constEnv, filePath, preserveWhitespace = fa
|
|
|
494
498
|
try {
|
|
495
499
|
const value = evalStatic(child.expression, constEnv, filePath);
|
|
496
500
|
if (typeof value === 'string') {
|
|
497
|
-
|
|
501
|
+
// When preserve_json_in_cli: string is raw HTML, do not escape
|
|
502
|
+
html += preserveJsonInCli ? value : escapeHTML(value);
|
|
498
503
|
}
|
|
499
504
|
else if (value != null) {
|
|
500
|
-
html += escapeHTML(String(value));
|
|
505
|
+
html += preserveJsonInCli ? String(value) : escapeHTML(String(value));
|
|
501
506
|
}
|
|
502
507
|
}
|
|
503
508
|
catch {
|
|
@@ -506,7 +511,7 @@ function jsxChildrenToHTML(children, constEnv, filePath, preserveWhitespace = fa
|
|
|
506
511
|
}
|
|
507
512
|
else if (child.type === 'JSXFragment') {
|
|
508
513
|
// Handle fragments by recursively processing their children
|
|
509
|
-
html += jsxChildrenToHTML(child.children, constEnv, filePath, preserveWhitespace);
|
|
514
|
+
html += jsxChildrenToHTML(child.children, constEnv, filePath, preserveWhitespace, preserveJsonInCli);
|
|
510
515
|
}
|
|
511
516
|
// Ignore JSXSpreadChild and other unsupported types
|
|
512
517
|
}
|
|
@@ -592,7 +597,7 @@ function jsxElementToHTML(el, constEnv, filePath) {
|
|
|
592
597
|
}
|
|
593
598
|
}
|
|
594
599
|
const attrsStr = attrs.length > 0 ? ' ' + attrs.join(' ') : '';
|
|
595
|
-
// For <style> and <script> tags, preserve all whitespace to maintain CSS/JS formatting
|
|
600
|
+
// For <style> and <script> tags, preserve all whitespace to maintain CSS/JS formatting.
|
|
596
601
|
const isRawTextTag = tagName.toLowerCase() === 'style' || tagName.toLowerCase() === 'script';
|
|
597
602
|
const childrenHTML = jsxChildrenToHTML(el.children, constEnv, filePath, isRawTextTag);
|
|
598
603
|
if (el.closingElement) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parsePage.js","sourceRoot":"","sources":["../../src/compiler/parsePage.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parsePage.js","sourceRoot":"","sources":["../../src/compiler/parsePage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reverse.d.ts","sourceRoot":"","sources":["../../src/compiler/reverse.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,YAAY,CAAA;AAgoBzD,wBAAsB,cAAc,CAClC,UAAU,EAAE;IACV,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC5B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,GAAG,EAAE,CAAA;IACnB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB,EACD,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE;IACL,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,YAAY,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAC5E,iBAkFF;
|
|
1
|
+
{"version":3,"file":"reverse.d.ts","sourceRoot":"","sources":["../../src/compiler/reverse.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,YAAY,CAAA;AAgoBzD,wBAAsB,cAAc,CAClC,UAAU,EAAE;IACV,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC5B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,GAAG,EAAE,CAAA;IACnB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB,EACD,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE;IACL,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,YAAY,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAC5E,iBAkFF;AAikDD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKpD"}
|
package/dist/compiler/reverse.js
CHANGED
|
@@ -249,7 +249,7 @@ const COMPONENT_SPECIFIC_PROPS = {
|
|
|
249
249
|
'description',
|
|
250
250
|
]),
|
|
251
251
|
ProgressBar: new Set([...BASE_COMPONENT_PROPS, 'value', 'max', 'show_percentage']),
|
|
252
|
-
CustomHTML: new Set([...BASE_COMPONENT_PROPS, 'text']),
|
|
252
|
+
CustomHTML: new Set([...BASE_COMPONENT_PROPS, 'text', 'preserve_json_in_cli']),
|
|
253
253
|
};
|
|
254
254
|
/**
|
|
255
255
|
* Checks if a component has all required props.
|
|
@@ -1110,8 +1110,20 @@ function generateJSX(node, indent = 4, pageKey, componentId, nameMap, validation
|
|
|
1110
1110
|
if (textIndex !== -1) {
|
|
1111
1111
|
props.splice(textIndex, 1);
|
|
1112
1112
|
}
|
|
1113
|
-
//
|
|
1114
|
-
|
|
1113
|
+
// When preserve_json_in_cli is set, emit raw text as template literal without HTML formatting
|
|
1114
|
+
const preserveJsonInCli = comp.preserve_json_in_cli === true;
|
|
1115
|
+
if (preserveJsonInCli) {
|
|
1116
|
+
const escaped = comp.text
|
|
1117
|
+
.replace(/\\/g, '\\\\')
|
|
1118
|
+
.replace(/`/g, '\\`')
|
|
1119
|
+
.replace(/\$\{/g, '\\${')
|
|
1120
|
+
.replace(/\r\n|\r|\n/g, '\\n');
|
|
1121
|
+
const childIndentStr = ' '.repeat(indent + 2);
|
|
1122
|
+
customHTMLChildren = `${childIndentStr}{\`${escaped}\`}`;
|
|
1123
|
+
}
|
|
1124
|
+
else {
|
|
1125
|
+
customHTMLChildren = htmlToJSXChildren(comp.text, indent + 2);
|
|
1126
|
+
}
|
|
1115
1127
|
}
|
|
1116
1128
|
const indentStr = ' '.repeat(indent);
|
|
1117
1129
|
const childIndent = indent + 2;
|
|
@@ -1269,7 +1281,8 @@ function htmlToJSXChildren(html, indent) {
|
|
|
1269
1281
|
// First, find all attribute names (with or without values)
|
|
1270
1282
|
// Match: attr, attr=value, attr="value", attr='value'
|
|
1271
1283
|
// We need to handle attributes without values (like <img alt />) and skip them
|
|
1272
|
-
|
|
1284
|
+
// Note: [\w-]+ matches attribute names with hyphens (e.g., stroke-width, data-id)
|
|
1285
|
+
const attrRegex = /([\w-]+)(?:="([^"]*)"|='([^']*)'|=(.+?)(?=[\s>]|$))?/g;
|
|
1273
1286
|
let attrMatch;
|
|
1274
1287
|
const seenAttrs = new Set();
|
|
1275
1288
|
while ((attrMatch = attrRegex.exec(htmlAttrsStr)) !== null) {
|
|
@@ -1429,12 +1442,10 @@ function htmlToJSXChildren(html, indent) {
|
|
|
1429
1442
|
.replace(/ /g, ' ');
|
|
1430
1443
|
// Check if text contains template variables
|
|
1431
1444
|
if (unescapedText.includes('{{')) {
|
|
1432
|
-
// Convert to template literal expression
|
|
1433
1445
|
const templateLiteral = stringToTemplateLiteral(unescapedText);
|
|
1434
1446
|
result.push(`${indentStr}{${templateLiteral}}`);
|
|
1435
1447
|
}
|
|
1436
1448
|
else {
|
|
1437
|
-
// Escape special characters for JSX text content
|
|
1438
1449
|
const escapedText = escapeTextForJSX(unescapedText);
|
|
1439
1450
|
result.push(`${indentStr}${escapedText}`);
|
|
1440
1451
|
}
|
|
@@ -1454,12 +1465,10 @@ function htmlToJSXChildren(html, indent) {
|
|
|
1454
1465
|
.replace(/ /g, ' ');
|
|
1455
1466
|
// Check if text contains template variables
|
|
1456
1467
|
if (unescapedText.includes('{{')) {
|
|
1457
|
-
// Convert to template literal expression
|
|
1458
1468
|
const templateLiteral = stringToTemplateLiteral(unescapedText);
|
|
1459
1469
|
result.push(`${indentStr}{${templateLiteral}}`);
|
|
1460
1470
|
}
|
|
1461
1471
|
else {
|
|
1462
|
-
// Escape special characters for JSX text content
|
|
1463
1472
|
const escapedText = escapeTextForJSX(unescapedText);
|
|
1464
1473
|
result.push(`${indentStr}${escapedText}`);
|
|
1465
1474
|
}
|