@astrale-os/cli 1.0.0-beta.21 → 1.0.0-beta.23

package/src/ui/operations.ts

@@ -134,8 +134,45 @@ function activateTheme(current: string, statement: string): string {
     .replace(/^\n/u, '')
 }
 
-function manifestDependencies(manifest: Record<string, unknown>): Record<string, string> {
-  return { ...(manifest.dependencies as Record<string, string> | undefined) }
+type ManifestDependencySection = 'dependencies' | 'devDependencies'
+
+function manifestDependencies(
+  manifest: Record<string, unknown>,
+  section: ManifestDependencySection = 'dependencies',
+): Record<string, string> {
+  return { ...(manifest[section] as Record<string, string> | undefined) }
+}
+
+function uiDependencySection(
+  manifest: Record<string, unknown>,
+  fallback: ManifestDependencySection = 'dependencies',
+): ManifestDependencySection {
+  const runtime = Object.hasOwn(manifestDependencies(manifest), UI_PACKAGE)
+  const development = Object.hasOwn(manifestDependencies(manifest, 'devDependencies'), UI_PACKAGE)
+  if (runtime && development) {
+    throw new UiError(
+      'UI_PROJECT_UNSUPPORTED',
+      UI_PACKAGE + ' must be declared in exactly one dependency section.',
+      'Remove it from either dependencies or devDependencies, then retry.',
+    )
+  }
+  if (development) return 'devDependencies'
+  if (runtime) return 'dependencies'
+  return fallback
+}
+
+function setUiDependency(
+  manifest: Record<string, unknown>,
+  section: ManifestDependencySection,
+  version: string,
+): void {
+  const other = section === 'dependencies' ? 'devDependencies' : 'dependencies'
+  manifest[section] = { ...manifestDependencies(manifest, section), [UI_PACKAGE]: version }
+  const otherDependencies = manifestDependencies(manifest, other)
+  if (Object.hasOwn(otherDependencies, UI_PACKAGE)) {
+    delete otherDependencies[UI_PACKAGE]
+    manifest[other] = otherDependencies
+  }
 }
 
 function domainRegistryPackagePath(project: UiProject): string {
@@ -294,6 +331,10 @@ export async function initUi(
   }
   if ((await exists(project.uiLockPath)) && !options.force) {
     const lock = await readUiLock(project.uiLockPath)
+    const dependencySection = uiDependencySection(project.packageJson)
+    const dependencyVersion = manifestDependencies(project.packageJson, dependencySection)[
+      UI_PACKAGE
+    ]
     const css = (await readOptional(project.cssPath)) ?? ''
     const components = await readOptional(project.componentsPath)
       .then((value) => (value ? (JSON.parse(value) as Record<string, unknown>) : undefined))
@@ -301,6 +342,7 @@ export async function initUi(
     const requestedVersion = options.version?.replace(/^v/u, '')
     const desired =
       (!requestedVersion || requestedVersion === lock.package.version) &&
+      dependencyVersion === lock.package.version &&
       (!options.preset || options.preset === lock.preset) &&
       css.includes(UI_PACKAGE + '/theme.css') &&
       css.includes(UI_PACKAGE + '/presets/' + lock.preset + '.css') &&
@@ -362,10 +404,7 @@ export async function initUi(
 
   try {
     const manifest = { ...project.packageJson }
-    manifest.dependencies = {
-      ...manifestDependencies(manifest),
-      [UI_PACKAGE]: release.version,
-    }
+    setUiDependency(manifest, uiDependencySection(manifest), release.version)
     await writeDomainRegistryWorkspace(project, manifest)
     await writeJson(project.packageJsonPath, manifest)
 
@@ -461,14 +500,17 @@ export async function initUi(
 async function pinUiDependency(
   project: UiProject,
   version: string,
+  section: ManifestDependencySection,
   runner: UiRunner,
 ): Promise<void> {
   const manifest = JSON.parse(await readFile(project.packageJsonPath, 'utf8')) as Record<
     string,
     unknown
   >
-  if (manifestDependencies(manifest)[UI_PACKAGE] === version) return
-  manifest.dependencies = { ...manifestDependencies(manifest), [UI_PACKAGE]: version }
+  const current = manifestDependencies(manifest, section)[UI_PACKAGE]
+  const other = section === 'dependencies' ? 'devDependencies' : 'dependencies'
+  if (current === version && manifestDependencies(manifest, other)[UI_PACKAGE] === undefined) return
+  setUiDependency(manifest, section, version)
   await writeJson(project.packageJsonPath, manifest)
   const result = await runner(project.manager, ['install'], project.root)
   if (result.code !== 0) {
@@ -544,6 +586,17 @@ async function addLocalTheme(
   const source = await readFile(sourcePath, 'utf8')
   admitLocalThemeCss(source, slug)
 
+  return installThemeCss(slug, source, digest(source), address, project, options)
+}
+
+async function installThemeCss(
+  slug: string,
+  source: string,
+  sourceDigest: string,
+  sourceLabel: string,
+  project: UiProject,
+  options: { dryRun?: boolean; overwrite?: boolean },
+): Promise<Record<string, unknown>> {
   const lock = await readUiLock(project.uiLockPath)
   const canonicalAddress = 'theme/' + slug
   const relativeTarget = 'components/astrale/theme/' + slug + '.css'
@@ -573,7 +626,7 @@ async function addLocalTheme(
     items: [canonicalAddress],
     files: { [canonicalAddress]: { [relativeTarget]: digest(source) } },
     activation: { file: projectRelative(project, project.cssPath), import: statement },
-    source: address,
+    source: sourceLabel,
   }
   if (options.dryRun) return result
 
@@ -588,7 +641,7 @@ async function addLocalTheme(
     await writeFile(project.cssPath, activateTheme(css, statement), 'utf8')
     lock.items[canonicalAddress] = {
       address: canonicalAddress,
-      sourceDigest: digest(source),
+      sourceDigest,
       files: { [relativeTarget]: digest(source) },
     }
     await writeJson(project.uiLockPath, lock)
@@ -602,6 +655,28 @@ async function addLocalTheme(
   }
 }
 
+async function addReleasedTheme(
+  item: UiRegistryItem,
+  document: UiRegistryItem,
+  project: UiProject,
+  options: { dryRun?: boolean; overwrite?: boolean },
+): Promise<Record<string, unknown>> {
+  const slug = item.meta.canonicalAddress.slice('theme/'.length)
+  const source = document.files[0]?.content
+  if (typeof source !== 'string') {
+    throw new UiError('UI_REGISTRY_UNAVAILABLE', 'The released theme has no admitted CSS source.')
+  }
+  admitLocalThemeCss(source, slug)
+  return installThemeCss(
+    slug,
+    source,
+    digest(JSON.stringify(document)),
+    item.meta.canonicalAddress,
+    project,
+    options,
+  )
+}
+
 export async function addUi(
   addresses: string[],
   options: { project?: string; dryRun?: boolean; overwrite?: boolean; yes?: boolean },
@@ -630,6 +705,7 @@ export async function addUi(
     return addLocalTheme(localThemes[0]!, project, options)
   }
   const { lock, release } = await lockedRelease(project, dependencies.fetcher)
+  const dependencySection = uiDependencySection(project.packageJson)
   const items = addresses.map((address) => findItem(release, address))
   const themes = items.filter((item) => item.type === 'registry:theme')
   if (themes.length > 1) {
@@ -638,6 +714,15 @@ export async function addUi(
   const itemDocuments = await Promise.all(
     items.map((item) => readUiRegistryItem(release, item, dependencies.fetcher)),
   )
+  if (themes.length === 1) {
+    if (items.length !== 1) {
+      throw new UiError(
+        'UI_ITEM_CONFLICT',
+        'Install a released theme separately from patterns and blocks.',
+      )
+    }
+    return addReleasedTheme(themes[0]!, itemDocuments[0]!, project, options)
+  }
   await rejectLocalChanges(project, lock, items, options.overwrite === true)
   const targets = (
     await Promise.all(
@@ -689,7 +774,12 @@ export async function addUi(
           throw new UiError('UI_TOOL_FAILED', 'The pinned shadcn operation omitted an item file.')
         }
       }
-      await pinUiDependency(project, lock.package.version, dependencies.runner ?? defaultUiRunner)
+      await pinUiDependency(
+        project,
+        lock.package.version,
+        dependencySection,
+        dependencies.runner ?? defaultUiRunner,
+      )
       const theme = themes[0]
       const themeTarget = theme?.files[0]?.target
       if (themeTarget) {
@@ -779,11 +869,24 @@ export async function doctorUi(
       detail: error instanceof Error ? error.message : String(error),
     })
   }
-  const dependencies = manifestDependencies(project.packageJson)
+  const runtimeVersion = manifestDependencies(project.packageJson)[UI_PACKAGE]
+  const developmentVersion = manifestDependencies(project.packageJson, 'devDependencies')[
+    UI_PACKAGE
+  ]
+  const declarations = [runtimeVersion, developmentVersion].filter(
+    (version): version is string => typeof version === 'string',
+  )
+  const packageVersion = declarations.length === 1 ? declarations[0] : undefined
   checks.push({
     check: 'package',
-    ok: typeof dependencies[UI_PACKAGE] === 'string',
-    detail: dependencies[UI_PACKAGE],
+    ok: declarations.length === 1 && (!lock || packageVersion === lock.package.version),
+    detail:
+      declarations.length > 1
+        ? 'declared in dependencies and devDependencies'
+        : packageVersion === undefined
+          ? 'missing'
+          : (runtimeVersion === packageVersion ? 'dependencies:' : 'devDependencies:') +
+            packageVersion,
   })
   const css = (await readOptional(project.cssPath)) ?? ''
   checks.push({ check: 'theme', ok: css.includes(UI_PACKAGE + '/theme.css') })

package/src/ui/release.ts

@@ -250,8 +250,14 @@ function isInstallableItem(item: unknown): item is UiRegistry['items'][number] {
     /^(?:pattern|block)-[a-z0-9-]+$/u.test(candidate.name) &&
     typeof address === 'string' &&
     /^(?:pattern|block)\/[a-z0-9-]+\/[a-z0-9-/]+$/u.test(address)
+  const isComponent =
+    candidate.type === 'registry:component' &&
+    typeof candidate.name === 'string' &&
+    /^component-[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/u.test(candidate.name) &&
+    typeof address === 'string' &&
+    /^component\/[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/u.test(address)
   return (
-    (isTheme || isComposition) &&
+    (isTheme || isComposition || isComponent) &&
     (candidate.dependencies === undefined ||
       (Array.isArray(candidate.dependencies) &&
         candidate.dependencies.every(
@@ -274,7 +280,8 @@ function isInstallableItem(item: unknown): item is UiRegistry['items'][number] {
           (candidate.files?.length === 1 &&
             file.type === 'registry:file' &&
             file.target ===
-              'components/astrale/theme/' + address!.slice('theme/'.length) + '.css')),
+              'components/astrale/theme/' + address!.slice('theme/'.length) + '.css')) &&
+        (!isComponent || file.target.startsWith('components/astrale/component/')),
     ) &&
     typeof address === 'string'
   )