uniweb 0.10.13 → 0.12.0

package/src/utils/registry.js

@@ -1,20 +1,36 @@
 /**
  * Local Foundation Registry
  *
- * Manages published foundations in .unicloud/registry/.
- * Same on-disk format as scripts/platform/registry.js, so
- * scripts/platform/serve.js can still serve them.
+ * Manages published foundations in .unicloud/registry/. The on-disk
+ * shape mirrors uniweb-edge's registry index (versions as an array of
+ * { version, ... } objects, plus top-level namespace and latest) so
+ * `--local` exercises the same data shape that ships in production.
  *
  * Layout:
  *   .unicloud/
  *     registry/
- *       index.json                  # { "name": { versions: { "1.0.0": { ... } } } }
+ *       index.json                  # see "Index format" below
  *       packages/
  *         name/
  *           1.0.0/
  *             foundation.js
  *             schema.json
  *             assets/...
+ *
+ * Index format:
+ *   {
+ *     "@ns/name": {
+ *       namespace: "ns",
+ *       versions: [
+ *         { version: "1.0.0", publishedAt, publishedBy, ... },
+ *         ...
+ *       ],
+ *       latest: "1.0.0"
+ *     }
+ *   }
+ *
+ *   Legacy entries (versions as an object keyed by version) are migrated
+ *   to this shape on read. The next write persists the new shape.
  */
 
 import { existsSync } from 'node:fs'
@@ -37,7 +53,7 @@ export function getRegistryDir(startDir = process.cwd()) {
 
 /**
  * Sanitize a package name for filesystem use.
- * '@org/pkg' → '@org__pkg'
+ * '@org/pkg' → 'org/pkg'
  * @param {string} name
  * @returns {string}
  */
@@ -46,6 +62,38 @@ function sanitizeName(name) {
   return name.startsWith('@') ? name.slice(1) : name
 }
 
+/**
+ * Parse the namespace out of a scoped package name. '@org/pkg' → 'org';
+ * unscoped → ''.
+ * @param {string} name
+ * @returns {string}
+ */
+function parseNamespace(name) {
+  const m = /^@([a-z0-9_-]+)\//.exec(name)
+  return m ? m[1] : ''
+}
+
+/**
+ * Migrate a legacy index entry (versions as object, no namespace/latest)
+ * to the current shape (versions as array, namespace + latest at top).
+ * Mutates and returns the entry.
+ */
+function normalizeEntry(name, entry) {
+  if (!entry) return entry
+  if (entry.versions && !Array.isArray(entry.versions) && typeof entry.versions === 'object') {
+    entry.versions = Object.entries(entry.versions).map(([version, data]) => ({
+      version,
+      ...data,
+    }))
+  }
+  if (!Array.isArray(entry.versions)) entry.versions = []
+  if (!entry.namespace) entry.namespace = parseNamespace(name)
+  if (!entry.latest && entry.versions.length > 0) {
+    entry.latest = entry.versions[entry.versions.length - 1].version
+  }
+  return entry
+}
+
 /**
  * Local registry — stores published foundations in .unicloud/registry/
  */
@@ -58,7 +106,11 @@ export class LocalRegistry {
 
   async _readIndex() {
     if (!existsSync(this.indexPath)) return {}
-    return JSON.parse(await readFile(this.indexPath, 'utf8'))
+    const raw = JSON.parse(await readFile(this.indexPath, 'utf8'))
+    for (const name of Object.keys(raw)) {
+      normalizeEntry(name, raw[name])
+    }
+    return raw
   }
 
   async _writeIndex(index) {
@@ -74,17 +126,20 @@ export class LocalRegistry {
    */
   async exists(name, version) {
     const index = await this._readIndex()
-    return !!index[name]?.versions?.[version]
+    const versions = index[name]?.versions
+    if (!Array.isArray(versions)) return false
+    return versions.some(v => v.version === version)
   }
 
   /**
-   * Get all published versions for a package.
+   * Get all published versions for a package as an array of
+   * `{ version, publishedAt, ... }` entries (matches uniweb-edge).
    * @param {string} name
-   * @returns {Promise<Object>}
+   * @returns {Promise<Array>}
    */
   async getVersions(name) {
     const index = await this._readIndex()
-    return index[name]?.versions || {}
+    return index[name]?.versions || []
   }
 
   /**
@@ -104,12 +159,26 @@ export class LocalRegistry {
 
     const index = await this._readIndex()
     if (!index[name]) {
-      index[name] = { versions: {} }
+      index[name] = {
+        namespace: parseNamespace(name),
+        versions: [],
+        latest: null,
+      }
     }
-    index[name].versions[version] = {
+
+    const versionEntry = {
+      version,
       publishedAt: new Date().toISOString(),
       ...metadata,
     }
+    const existingIdx = index[name].versions.findIndex(v => v.version === version)
+    if (existingIdx >= 0) {
+      index[name].versions[existingIdx] = versionEntry
+    } else {
+      index[name].versions.push(versionEntry)
+    }
+    index[name].latest = version
+
     await this._writeIndex(index)
   }
 
@@ -165,20 +234,23 @@ export class RemoteRegistry {
   async exists(name, version) {
     try {
       const index = await this._fetchIndex()
-      return !!index[name]?.versions?.[version]
+      const versions = index[name]?.versions
+      if (!Array.isArray(versions)) return false
+      return versions.some(v => v.version === version)
     } catch {
       return false
     }
   }
 
   /**
-   * Get all published versions for a package.
+   * Get all published versions for a package as an array of
+   * `{ version, publishedAt, ... }` entries.
    * @param {string} name
-   * @returns {Promise<Object>}
+   * @returns {Promise<Array>}
    */
   async getVersions(name) {
     const index = await this._fetchIndex()
-    return index[name]?.versions || {}
+    return index[name]?.versions || []
   }
 
   /**

package/src/utils/scaffold.js

@@ -94,7 +94,13 @@ export async function scaffoldSite(targetDir, context, options = {}) {
  * Apply content overlay from a content directory onto a target
  *
  * Content files overwrite scaffolded defaults. Structural files
- * (package.json, vite.config.js, main.js, index.html) are NOT overwritten.
+ * (package.json, vite.config.js, entry.js, index.html) are NOT overwritten.
+ *
+ * Note: a foundation's `main.js` (the user-authored declarations file) is
+ * NOT structural — templates legitimately provide their own `main.js` to
+ * override the empty scaffold default. The site's `entry.js` (formerly
+ * `main.js`) IS structural — the boilerplate `start({...})` is identical
+ * across all sites and shouldn't be overwritten.
  *
  * @param {string} contentDir - Source content directory (e.g., starter/foundation/)
  * @param {string} targetDir - Target directory to overlay onto
@@ -110,7 +116,7 @@ export async function applyContent(contentDir, targetDir, context, options = {})
   const STRUCTURAL_FILES = new Set([
     'package.json',
     'vite.config.js',
-    'main.js',
+    'entry.js',
     'index.html',
     '.gitignore',
   ])

package/src/utils/workspace.js

@@ -10,6 +10,7 @@ import { existsSync, readdirSync, readFileSync } from 'node:fs'
 import { readFile } from 'node:fs/promises'
 import { resolve, dirname, join } from 'node:path'
 import yaml from 'js-yaml'
+import { classifyPackage as classifyPackageSync } from '@uniweb/build'
 
 /**
  * Check if a directory is a workspace root.
@@ -124,38 +125,17 @@ export async function getWorkspacePackages(workspaceRoot) {
 }
 
 /**
- * Classify a package as foundation, site, or unknown
+ * Classify a package as foundation, site, or unknown.
  *
- * Classification logic:
- * - Site: has @uniweb/runtime in dependencies (checked first, more specific)
- * - Foundation: has @uniweb/build in devDependencies but NOT @uniweb/runtime
- *
- * Note: Sites also have @uniweb/build for the Vite plugin, so we check
- * for @uniweb/runtime first to distinguish them.
+ * Re-exports the canonical (sync) classifier from @uniweb/build, kept
+ * async-shaped here so existing call sites continue to work without an
+ * await-removal sweep. New code should import directly from @uniweb/build.
  *
  * @param {string} packagePath - Full path to package directory
  * @returns {Promise<'foundation'|'site'|null>}
  */
 export async function classifyPackage(packagePath) {
-  const pkgJsonPath = join(packagePath, 'package.json')
-  if (!existsSync(pkgJsonPath)) return null
-
-  try {
-    const pkg = JSON.parse(await readFile(pkgJsonPath, 'utf-8'))
-
-    // Site: has @uniweb/runtime in dependencies (check first - more specific)
-    if (pkg.dependencies?.['@uniweb/runtime']) {
-      return 'site'
-    }
-    // Foundation: has @uniweb/build in devDependencies (and not a site)
-    if (pkg.devDependencies?.['@uniweb/build']) {
-      return 'foundation'
-    }
-  } catch {
-    // Ignore parse errors
-  }
-
-  return null
+  return classifyPackageSync(packagePath)
 }
 
 /**
@@ -165,16 +145,7 @@ export async function classifyPackage(packagePath) {
  */
 export async function findFoundations(workspaceRoot) {
   const packages = await getWorkspacePackages(workspaceRoot)
-  const foundations = []
-
-  for (const pkg of packages) {
-    const fullPath = join(workspaceRoot, pkg)
-    if ((await classifyPackage(fullPath)) === 'foundation') {
-      foundations.push(pkg)
-    }
-  }
-
-  return foundations
+  return packages.filter(pkg => classifyPackageSync(join(workspaceRoot, pkg)) === 'foundation')
 }
 
 /**
@@ -184,16 +155,7 @@ export async function findFoundations(workspaceRoot) {
  */
 export async function findSites(workspaceRoot) {
   const packages = await getWorkspacePackages(workspaceRoot)
-  const sites = []
-
-  for (const pkg of packages) {
-    const fullPath = join(workspaceRoot, pkg)
-    if ((await classifyPackage(fullPath)) === 'site') {
-      sites.push(pkg)
-    }
-  }
-
-  return sites
+  return packages.filter(pkg => classifyPackageSync(join(workspaceRoot, pkg)) === 'site')
 }
 
 /**

package/starter/site/pages/home/1-welcome.md.hbs

@@ -8,7 +8,7 @@ align: center
 
 ## Your Uniweb project is ready
 
-This is a minimal starting point for your Uniweb project. Edit the content in `site/pages/` and build section types in `foundation/src/sections/`.
+This is a minimal starting point for your Uniweb project. Edit the content in `site/pages/` and build section types in `src/sections/`.
 
 [About](/about)
 [Documentation](https://github.com/uniweb)

package/templates/foundation/{src/foundation.js.hbs → main.js.hbs}

@@ -19,7 +19,7 @@ export default {
 {{else}}
 export default {
   // ─── Layout ─────────────────────────────────────────────────────────────────
-  // Create layouts in src/layouts/MyLayout/index.jsx (auto-discovered).
+  // Create layouts in layouts/MyLayout/index.jsx (auto-discovered).
   // defaultLayout: 'MyLayout',
 
   // ─── Props ──────────────────────────────────────────────────────────────────

package/templates/foundation/package.json.hbs

@@ -3,18 +3,18 @@
   "version": "0.1.0",
   "description": "{{projectName}} foundation",
   "type": "module",
-  "main": "./src/_entry.generated.js",
+  "main": "./_entry.generated.js",
   "exports": {
-    ".": "./src/_entry.generated.js",
-    "./styles": "./src/styles.css",
+    ".": "./_entry.generated.js",
+    "./styles": "./styles.css",
     "./dist": "./dist/foundation.js",
     "./dist/styles": "./dist/assets/style.css"
   },
   "imports": {
-    "#components/*": "./src/components/*",
-    "#utils/*": "./src/utils/*"
+    "#components/*": "./components/*",
+    "#utils/*": "./utils/*"
   },
-  "files": ["dist", "src"],
+  "files": ["dist", "sections", "components", "layouts", "utils", "main.js", "styles.css", "_entry.generated.js"],
   "scripts": {
     "dev": "vite",
     "build": "uniweb build",

package/templates/foundation/{src/styles.css → styles.css}

@@ -3,4 +3,4 @@
 
 @source "./sections/**/*.{js,jsx}";
 @source "./layouts/**/*.{js,jsx}";
-@source "../node_modules/@uniweb/kit/src/**/*.{js,jsx}";
+@source "./node_modules/@uniweb/kit/src/**/*.{js,jsx}";

package/templates/site/index.html.hbs

@@ -8,6 +8,6 @@
   </head>
   <body>
     <div id="root"></div>
-    <script type="module" src="/main.js"></script>
+    <script type="module" src="/entry.js"></script>
   </body>
 </html>

package/templates/site/theme.yml

@@ -93,7 +93,7 @@ colors:
 
 # ─── Foundation Variables ──────────────────────────────────────────────────────
 # Override variables declared by the foundation (e.g., header-height, max-width).
-# Available variables depend on the foundation — check its foundation.js.
+# Available variables depend on the foundation — check its main.js.
 
 # vars:
 #   header-height: 5rem

package/templates/workspace/README.md.hbs

@@ -8,10 +8,10 @@ A website built with [Uniweb](https://github.com/uniweb/cli) — a component web
 
 ```
 {{projectName}}/
-├── foundation/          # React component library
-│   ├── src/
-│   │   ├── sections/    # Section types (selectable by content authors)
-│   │   └── styles.css   # Tailwind CSS v4 theme
+├── src/                 # Foundation package (the site's source code; pkg name: src)
+│   ├── sections/        # Section types (selectable by content authors)
+│   ├── styles.css       # Tailwind CSS v4 theme
+│   ├── main.js          # Foundation declarations (vars, defaultLayout, props)
 │   └── vite.config.js   # defineFoundationConfig()
 │
 ├── site/                # Content (markdown)
@@ -19,12 +19,14 @@ A website built with [Uniweb](https://github.com/uniweb/cli) — a component web
 │   │   └── home/
 │   │       ├── page.yml
 │   │       └── 1-welcome.md
-│   ├── site.yml         # Site configuration
+│   ├── site.yml         # Site configuration (foundation: src)
 │   └── vite.config.js   # defineSiteConfig()
 │
 └── AGENTS.md            # Developer guide (human + AI)
 ```
 
+A site is pure content. A foundation is the site's source code — that's why it lives in `src/`.
+
 ## Content Authoring
 
 Content lives in markdown files under `site/pages/`:
@@ -46,10 +48,10 @@ Your content here.
 
 ## Component Development
 
-Section types live in `foundation/src/sections/`. Each is a folder with an `index.jsx` and a `meta.js`:
+Section types live in `src/sections/`. Each is a folder with an `index.jsx` and a `meta.js`:
 
 ```jsx
-// foundation/src/sections/Hero/index.jsx
+// src/sections/Hero/index.jsx
 import { H1, P } from '@uniweb/kit'
 
 export default function Hero({ content }) {