@ubox-tools/deploy-xperience 1.1.21 → 1.1.23

package/README.md

@@ -106,15 +106,16 @@ When `--ubox-id` is provided, the search/create step is skipped entirely and the
 
 ## Proxy / Source Transformation
 
-Before injecting source files, `generateProxy()` applies three transforms to each file:
+Before injecting source files, `generateProxy()` applies transforms to each file:
 
 | Transform | Applies to | What it does |
 |---|---|---|
-| Parameter substitution | JS | Replaces `const KEY = "value"` with `const KEY = "{parameter:KEY}"` for every key in `parameters.json` |
 | Asset path substitution | JS, CSS | Replaces `../assets/file.ext` references with `{resources:type/file.ext}` tokens |
 | Emoji escaping | JS | Converts non-ASCII characters to `\uXXXX` Unicode escape sequences |
 | Local tag stripping | HTML | Removes local `<link href>` and `<script src>` tags (CDN URLs are kept) |
 
+> **Parameter tokens are embedded at authoring time** — `data.js` uses inline `{parameter:key}` tokens with local fallbacks. No deploy-time regex substitution is performed.
+
 ## Project Layout Expected
 
 ```

package/deploy.js

@@ -238,15 +238,7 @@ function generateProxy(appName) {
     const isHTML   = ext === 'html';
 
     if (isJS || isCSS) {
-      // 1. Parameter token substitution (JS only — parameters live in JS files)
-      if (isJS) {
-        for (const key of Object.keys(params)) {
-          const re = new RegExp(`((?:const|let|var)\\s+${key}\\s*=\\s*)(?:"[^"]*"|'[^']*')`, 'g');
-          content = content.replace(re, `$1"{parameter:${key}}"`);
-        }
-      }
-
-      // 2. Asset path substitution: "...assets/file.ext" → "{resources:type/file.ext}"
+      // 1. Asset path substitution: "...assets/file.ext" → "{resources:type/file.ext}"
       const assetInStringRe = /(['"])(?:\.\.\/)*assets\/([^'"]+)\1/g;
       content = content.replace(assetInStringRe, (match, quote, assetFile) => {
         const assetExt  = path.extname(assetFile).slice(1).toLowerCase();
@@ -416,33 +408,22 @@ async function uploadFile(page, absPath) {
   await client.detach();
 }
 
-/** Inject text content into the active Monaco/CodeMirror/Ace editor.
- *  @param {string} filename  Source filename (e.g. "index.html") — used to pick
- *                            the right Monaco model by URI when multiple models are
- *                            pre-loaded (e.g. after visiting the Parameters tab). */
-async function injectToEditor(page, content, filename) {
+/** Inject text content into the active Monaco/CodeMirror/Ace editor. */
+async function injectToEditor(page, content) {
   // Try Monaco API
-  const monacoResult = await page.evaluate((text, fn) => {
-    if (!window.monaco?.editor) return null;
+  const monacoOk = await page.evaluate(text => {
+    if (!window.monaco?.editor) return false;
     const models = window.monaco.editor.getModels();
-    if (!models?.length) return null;
-
-    // Best: match model by filename in its URI — avoids the models[0] trap when
-    // multiple models are pre-loaded (happens after visiting the Parameters tab).
-    if (fn) {
-      const m = models.find(m => m.uri?.toString().includes(fn));
-      if (m) { m.setValue(text); return 'uri'; }
-    }
-
-    // Safe fallback: single model is always the active one (lazy-load case).
-    if (models.length === 1) { models[0].setValue(text); return 'single'; }
-
-    // Multiple models, no URI match — fall through to keyboard injection.
-    return `multi:${models.length}:${models.map(m => m.uri?.toString()).join('|')}`;
-  }, content, filename ?? null);
-
-  if (monacoResult === 'uri' || monacoResult === 'single') return;
-  if (monacoResult) console.log(`      [editor] Monaco ${monacoResult} → keyboard fallback`);
+    if (!models?.length) return false;
+    // Use the LAST model, not the first. When the Parameters tab is visited before
+    // the source editor, Monaco pre-loads a read-only preview model (model/1) first.
+    // The actual edit model (model/4) is created later and sits at the end of the
+    // list. For apps with no parameters (lazy-load), there is only one model, so
+    // last === first and behaviour is unchanged.
+    models[models.length - 1].setValue(text);
+    return true;
+  }, content);
+  if (monacoOk) return;
 
   // Try CodeMirror API
   const cmOk = await page.evaluate(text => {
@@ -452,23 +433,16 @@ async function injectToEditor(page, content, filename) {
   }, content);
   if (cmOk) return;
 
-  // Keyboard injection: click the visible editor, Ctrl+A, Ctrl+V.
-  // Targets whatever editor is currently focused (active tab) — model-agnostic.
+  // Fallback: clipboard paste into Ace / generic textarea
   writeClipboard(content);
-  const edPos = await page.evaluate(() => {
-    for (const sel of ['.monaco-editor', '.ace_editor', '.cm-editor', 'textarea']) {
-      const el = Array.from(document.querySelectorAll(sel))
-        .find(e => { const r = e.getBoundingClientRect(); return r.width > 10 && r.height > 10; });
-      if (el) {
-        el.scrollIntoView({ block: 'nearest' });
-        const r = el.getBoundingClientRect();
-        return { x: Math.round(r.x + r.width / 2), y: Math.round(r.y + r.height / 2) };
-      }
-    }
-    return null;
-  });
-  if (!edPos) throw new Error('No code editor found on page');
-  await page.mouse.click(edPos.x, edPos.y);
+  const ed = await page.$('.ace_editor, .cm-editor, .monaco-editor, textarea');
+  if (!ed) throw new Error('No code editor found on page');
+  const edRect = await page.evaluate(el => {
+    el.scrollIntoView({ block: 'nearest' });
+    const r = el.getBoundingClientRect();
+    return { x: Math.round(r.x + r.width / 2), y: Math.round(r.y + r.height / 2) };
+  }, ed);
+  await page.mouse.click(edRect.x, edRect.y);
   await sleep(200);
   await page.keyboard.down('Control');
   await page.keyboard.press('a');
@@ -705,7 +679,7 @@ async function injectSource(page, proxy) {
     console.log(`    ${filename} → ${tabLabel}`);
     await clickByText(page, tabLabel);
     await sleep(1000);
-    await injectToEditor(page, proxy[filename], filename);
+    await injectToEditor(page, proxy[filename]);
     await sleep(500);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubox-tools/deploy-xperience",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "description": "Deploy a Ubox experience to studio.ubox.world",
   "bin": { "deploy-xperience": "./deploy.js" },
   "dependencies": { "puppeteer": "*" },