@aiwayds/dsh-opentui 0.4.2 → 0.5.0

package/scripts/solid-js-pin.mjs

@@ -0,0 +1,286 @@
+/**
+ * Shared solid-js client-build pin for the dsh profile.
+ *
+ * solid-js's "node" export condition resolves to dist/server.js (SSR, no
+ * reactive scheduling): under the dsh host's node runtime the TUI renders one
+ * frame and then goes dead. Under bun dev the @opentui/solid preload remaps
+ * this; the host has no such preload, so the installed package itself must
+ * resolve to the client build. Two layers, both managed here:
+ *
+ *   1. a pnpm patchedDependencies patch — the primary fix, survives any
+ *      `pnpm install` in the profile
+ *   2. an idempotent direct rewrite of the installed package.json exports —
+ *      belt-and-braces for right after an install or a dist-host deploy
+ *
+ * Used by scripts/install-profile.mjs (before its pnpm install steps) and
+ * scripts/sync-profile.mjs (the local-dev deploy loop).
+ */
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+
+export const SOLID_JS_VERSION = '1.9.12'
+export const SOLID_PATCH_RELPATH = `patches/solid-js@${SOLID_JS_VERSION}.patch`
+
+// pristine solid-js@1.9.12 package.json -> client-pinned variant:
+// - "module" points at dist/solid.js instead of dist/server.js
+// - exports["."] drops the worker/deno/node conditions (node used to win and
+//   select the SSR build) and resolves straight to dist/solid.js
+// - the SSR-flavored subpath exports (./store, ./web, ./h, ...) go away; the
+//   host bundle imports bare "solid-js" only
+export const SOLID_JS_PATCH = `diff --git a/package.json b/package.json
+index ad27a1f..f3aa43a 100644
+--- a/package.json
++++ b/package.json
+@@ -10,7 +10,7 @@
+     "url": "https://github.com/solidjs/solid"
+   },
+   "main": "./dist/server.cjs",
+-  "module": "./dist/server.js",
++  "module": "./dist/solid.js",
+   "unpkg": "./dist/solid.cjs",
+   "types": "types/index.d.ts",
+   "sideEffects": false,
+@@ -44,164 +44,12 @@
+   ],
+   "exports": {
+     ".": {
+-      "worker": {
+-        "types": "./types/index.d.ts",
+-        "import": "./dist/server.js",
+-        "require": "./dist/server.cjs"
+-      },
+-      "browser": {
+-        "development": {
+-          "types": "./types/index.d.ts",
+-          "import": "./dist/dev.js",
+-          "require": "./dist/dev.cjs"
+-        },
+-        "types": "./types/index.d.ts",
+-        "import": "./dist/solid.js",
+-        "require": "./dist/solid.cjs"
+-      },
+-      "deno": {
+-        "types": "./types/index.d.ts",
+-        "import": "./dist/server.js",
+-        "require": "./dist/server.cjs"
+-      },
+-      "node": {
+-        "types": "./types/index.d.ts",
+-        "import": "./dist/server.js",
+-        "require": "./dist/server.cjs"
+-      },
+-      "development": {
+-        "types": "./types/index.d.ts",
+-        "import": "./dist/dev.js",
+-        "require": "./dist/dev.cjs"
+-      },
+       "types": "./types/index.d.ts",
+       "import": "./dist/solid.js",
+       "require": "./dist/solid.cjs"
+     },
+-    "./dist/*": "./dist/*",
+-    "./types/*": "./types/*",
+-    "./jsx-runtime": {
+-      "types": "./types/jsx.d.ts",
+-      "default": "./dist/solid.js"
+-    },
+-    "./jsx-dev-runtime": {
+-      "types": "./types/jsx.d.ts",
+-      "default": "./dist/solid.js"
+-    },
+-    "./store": {
+-      "worker": {
+-        "types": "./store/types/index.d.ts",
+-        "import": "./store/dist/server.js",
+-        "require": "./store/dist/server.cjs"
+-      },
+-      "browser": {
+-        "development": {
+-          "types": "./store/types/index.d.ts",
+-          "import": "./store/dist/dev.js",
+-          "require": "./store/dist/dev.cjs"
+-        },
+-        "types": "./store/types/index.d.ts",
+-        "import": "./store/dist/store.js",
+-        "require": "./store/dist/store.cjs"
+-      },
+-      "deno": {
+-        "types": "./store/types/index.d.ts",
+-        "import": "./store/dist/server.js",
+-        "require": "./store/dist/server.cjs"
+-      },
+-      "node": {
+-        "types": "./store/types/index.d.ts",
+-        "import": "./store/dist/server.js",
+-        "require": "./store/dist/server.cjs"
+-      },
+-      "development": {
+-        "types": "./store/types/index.d.ts",
+-        "import": "./store/dist/dev.js",
+-        "require": "./store/dist/dev.cjs"
+-      },
+-      "types": "./store/types/index.d.ts",
+-      "import": "./store/dist/store.js",
+-      "require": "./store/dist/store.cjs"
+-    },
+-    "./store/dist/*": "./store/dist/*",
+-    "./store/types/*": "./store/types/*",
+-    "./web": {
+-      "worker": {
+-        "types": "./web/types/index.d.ts",
+-        "import": "./web/dist/server.js",
+-        "require": "./web/dist/server.cjs"
+-      },
+-      "browser": {
+-        "development": {
+-          "types": "./web/types/index.d.ts",
+-          "import": "./web/dist/dev.js",
+-          "require": "./web/dist/dev.cjs"
+-        },
+-        "types": "./web/types/index.d.ts",
+-        "import": "./web/dist/web.js",
+-        "require": "./web/dist/web.cjs"
+-      },
+-      "deno": {
+-        "types": "./web/types/index.d.ts",
+-        "import": "./web/dist/server.js",
+-        "require": "./web/dist/server.cjs"
+-      },
+-      "node": {
+-        "types": "./web/types/index.d.ts",
+-        "import": "./web/dist/server.js",
+-        "require": "./web/dist/server.cjs"
+-      },
+-      "development": {
+-        "types": "./web/types/index.d.ts",
+-        "import": "./web/dist/dev.js",
+-        "require": "./web/dist/dev.cjs"
+-      },
+-      "types": "./web/types/index.d.ts",
+-      "import": "./web/dist/web.js",
+-      "require": "./web/dist/web.cjs"
+-    },
+-    "./web/storage": {
+-      "types": "./web/storage/types/index.d.ts",
+-      "import": "./web/storage/dist/storage.js",
+-      "require": "./web/storage/dist/storage.cjs"
+-    },
+-    "./web/dist/*": "./web/dist/*",
+-    "./web/types/*": "./web/types/*",
+-    "./universal": {
+-      "development": {
+-        "types": "./universal/types/index.d.ts",
+-        "import": "./universal/dist/dev.js",
+-        "require": "./universal/dist/dev.cjs"
+-      },
+-      "types": "./universal/types/index.d.ts",
+-      "import": "./universal/dist/universal.js",
+-      "require": "./universal/dist/universal.cjs"
+-    },
+-    "./universal/dist/*": "./universal/dist/*",
+-    "./universal/types/*": "./universal/types/*",
+-    "./h": {
+-      "types": "./h/types/index.d.ts",
+-      "import": "./h/dist/h.js",
+-      "require": "./h/dist/h.cjs"
+-    },
+-    "./h/jsx-runtime": {
+-      "types": "./h/jsx-runtime/types/index.d.ts",
+-      "import": "./h/jsx-runtime/dist/jsx.js",
+-      "require": "./h/jsx-runtime/dist/jsx.cjs"
+-    },
+-    "./h/jsx-dev-runtime": {
+-      "types": "./h/jsx-runtime/types/index.d.ts",
+-      "import": "./h/jsx-runtime/dist/jsx.js",
+-      "require": "./h/jsx-runtime/dist/jsx.cjs"
+-    },
+-    "./h/dist/*": "./h/dist/*",
+-    "./h/types/*": "./h/types/*",
+-    "./html": {
+-      "types": "./html/types/index.d.ts",
+-      "import": "./html/dist/html.js",
+-      "require": "./html/dist/html.cjs"
+-    },
+-    "./html/dist/*": "./html/dist/*",
++    "./dist/solid.js": "./dist/solid.js",
++    "./dist/solid.cjs": "./dist/solid.cjs",
+     "./package.json": "./package.json"
+   },
+   "keywords": [
+`
+
+// The exports object the pinned package.json must carry (also the target of
+// the direct re-pin below).
+export const SOLID_JS_EXPORTS = {
+  '.': { types: './types/index.d.ts', import: './dist/solid.js', require: './dist/solid.cjs' },
+  './dist/solid.js': './dist/solid.js',
+  './dist/solid.cjs': './dist/solid.cjs',
+  './package.json': './package.json',
+}
+
+const WORKSPACE_DEFAULT = `packages:
+  - .
+nodeLinker: hoisted
+autoInstallPeers: false
+`
+
+const PATCHED_DEPS_BLOCK = `patchedDependencies:
+  solid-js@${SOLID_JS_VERSION}: ${SOLID_PATCH_RELPATH}
+`
+
+/**
+ * Make sure the profile carries the solid-js patch and registers it with
+ * pnpm. Call BEFORE any `pnpm install` in the profile — patchedDependencies
+ * must be in pnpm-workspace.yaml when install runs for the pin to survive.
+ *
+ * Creates pnpm-workspace.yaml with the default hoisted layout when missing;
+ * otherwise appends the patchedDependencies key only when not yet present
+ * (user edits to the yaml are preserved). Returns what it did.
+ */
+export function ensureSolidPatch(profileDir) {
+  mkdirSync(join(profileDir, 'patches'), { recursive: true })
+  const patchPath = join(profileDir, SOLID_PATCH_RELPATH)
+  let patchWrote = false
+  if (!existsSync(patchPath) || readFileSync(patchPath, 'utf8') !== SOLID_JS_PATCH) {
+    writeFileSync(patchPath, SOLID_JS_PATCH)
+    patchWrote = true
+  }
+
+  const wsPath = join(profileDir, 'pnpm-workspace.yaml')
+  let workspaceNote
+  if (!existsSync(wsPath)) {
+    writeFileSync(wsPath, WORKSPACE_DEFAULT + PATCHED_DEPS_BLOCK)
+    workspaceNote = 'workspace created'
+  } else {
+    const ws = readFileSync(wsPath, 'utf8')
+    if (ws.includes(`solid-js@${SOLID_JS_VERSION}:`)) {
+      workspaceNote = 'patch already registered'
+    } else {
+      writeFileSync(wsPath, ws.replace(/\n*$/, '\n') + PATCHED_DEPS_BLOCK)
+      workspaceNote = 'patch registered in existing workspace'
+    }
+  }
+  return { patchWrote, workspaceNote }
+}
+
+/**
+ * Directly re-pin node_modules/solid-js/package.json to the client build.
+ * Idempotent: returns 'already' when the installed file already matches,
+ * 'pinned' after a rewrite, 'missing' when solid-js is not installed.
+ */
+export function pinSolidJsExports(profileDir) {
+  const solidPkg = join(profileDir, 'node_modules', 'solid-js', 'package.json')
+  let pkgJson
+  try {
+    pkgJson = JSON.parse(readFileSync(solidPkg, 'utf8'))
+  } catch {
+    return 'missing'
+  }
+  if (pkgJson.module === './dist/solid.js' && JSON.stringify(pkgJson.exports) === JSON.stringify(SOLID_JS_EXPORTS)) {
+    return 'already'
+  }
+  pkgJson.module = './dist/solid.js'
+  pkgJson.exports = SOLID_JS_EXPORTS
+  writeFileSync(solidPkg, JSON.stringify(pkgJson, null, 2))
+  return 'pinned'
+}

package/scripts/sync-profile.mjs

@@ -0,0 +1,62 @@
+#!/usr/bin/env node
+/**
+ * Deploy the local build into the dsh profile — the manual dev loop, codified:
+ *
+ *   1. bun build-host.ts                    — rebuild packages/shell/dist-host
+ *   2. rsync dist-host contents             — overlay the profile's installed
+ *                                              @aiwayds/dsh-opentui copy
+ *   3. solid-js patch + patchedDependencies — keep the client-build pin
+ *                                              pnpm-install-proof
+ *   4. direct re-pin of solid-js exports    — idempotent belt-and-braces
+ *
+ * Safe to re-run at any time; prints a summary of what was done.
+ * Run from anywhere (paths resolve from this file); `npm run sync` works too.
+ */
+import { spawnSync } from 'node:child_process'
+import { existsSync, mkdirSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { ensureSolidPatch, pinSolidJsExports } from './solid-js-pin.mjs'
+
+const shellDir = dirname(dirname(fileURLToPath(import.meta.url))) // packages/shell
+const DSH_HOME = process.env.DSH_HOME || join(homedir(), '.dsh')
+const profileDir = join(DSH_HOME, 'profiles', 'dsh-opentui')
+const dstPkg = join(profileDir, 'node_modules', '@aiwayds', 'dsh-opentui')
+
+const done = []
+const fail = (msg) => {
+  console.error(`[sync-profile] ${msg}`)
+  process.exit(1)
+}
+
+if (!existsSync(dstPkg)) fail(`profile package ${dstPkg} not installed — run the dsh installer or pnpm install in the profile first`)
+
+// 1. rebuild the host bundle. The bunfig preload that remaps solid-js to the
+//    client build lives in packages/shell, so bun MUST run with that cwd.
+const build = spawnSync('bun', ['build-host.ts'], { cwd: shellDir, stdio: 'inherit' })
+if (build.status !== 0) fail('bun build-host.ts failed')
+
+// 2. overlay the fresh dist-host into the profile's installed package.
+//    Plain `rsync -a` of the contents (no --delete): dist-host is fully owned
+//    by the build, and it ships its own node_modules — copy those too.
+const srcDist = join(shellDir, 'dist-host')
+const dstDist = join(dstPkg, 'dist-host')
+if (!existsSync(srcDist)) fail(`no dist-host at ${srcDist} — build produced nothing?`)
+mkdirSync(dstDist, { recursive: true })
+const rsync = spawnSync('rsync', ['-a', `${srcDist}/`, `${dstDist}/`])
+if (rsync.status !== 0) fail(`rsync failed: ${(rsync.stderr || '').toString().trim()}`)
+done.push(`rsync dist-host -> ${dstDist}`)
+
+// 3. keep the solid-js client pin pnpm-install-proof
+const { patchWrote, workspaceNote } = ensureSolidPatch(profileDir)
+done.push(`solid-js patch ${patchWrote ? 'written' : 'already current'} (${workspaceNote})`)
+
+// 4. idempotent direct re-pin of the installed solid-js exports
+const pinState = pinSolidJsExports(profileDir)
+if (pinState === 'missing') fail('solid-js not installed in the profile — pnpm install in the profile first')
+done.push(`solid-js exports ${pinState === 'pinned' ? 're-pinned to' : 'already pinned to'} client build (dist/solid.js)`)
+
+console.log('[sync-profile] done:')
+for (const step of done) console.log(`  - ${step}`)
+console.log(`[sync-profile] profile: ${profileDir}`)