@olonjs/cli 3.0.149 → 3.0.151

package/assets/src_tenant_alpha.sh

@@ -1817,11 +1817,14 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
     "@tiptap/extension-link": "^2.11.5",
     "@tiptap/react": "^2.11.5",
     "@tiptap/starter-kit": "^2.11.5",
-    "@olonjs/core": "^1.1.16",
+    "@olonjs/core": "^1.1.18",
+    "@olonjs/react": "^0.1.1",
+    "@olonjs/studio": "^0.1.1",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
     "motion": "^12.23.24",
+    "radix-ui": "^1.4.3",
     "react": "^19.0.0",
     "react-markdown": "^9.0.1",
     "react-dom": "^19.0.0",
@@ -2191,8 +2194,6 @@ async function readJsonFile(filePath) {
 }
 
 async function expandCollectionTarget(slug, pageFilePath) {
-  if (!/\[[^\]]+\]/.test(slug)) return [slug];
-
   let pageConfig;
   try {
     pageConfig = await readJsonFile(pageFilePath);
@@ -2206,7 +2207,14 @@ async function expandCollectionTarget(slug, pageFilePath) {
   }
 
   const token = `[${binding.paramKey}]`;
-  if (!slug.includes(token)) return [slug];
+  // Prefer authored route pattern (page.slug) when the file path is not parametric.
+  const authoredSlug =
+    typeof pageConfig.slug === 'string'
+      ? pageConfig.slug.replace(/\\/g, '/').replace(/^\/+|\/+$/g, '')
+      : '';
+  const routePattern =
+    authoredSlug.includes(token) ? authoredSlug : slug.includes(token) ? slug : '';
+  if (!routePattern) return [slug];
 
   const collectionPath = path.resolve(collectionsDir, binding.source, `${binding.source}.json`);
   let collection;
@@ -2218,7 +2226,9 @@ async function expandCollectionTarget(slug, pageFilePath) {
 
   if (!collection || typeof collection !== 'object' || Array.isArray(collection)) return [slug];
   const itemIds = Object.keys(collection).sort((a, b) => a.localeCompare(b));
-  return itemIds.length > 0 ? itemIds.map((itemId) => slug.replace(token, itemId)) : [slug];
+  return itemIds.length > 0
+    ? itemIds.map((itemId) => routePattern.replace(token, itemId))
+    : [slug];
 }
 
 async function listJsonFilesRecursive(dir) {
@@ -2942,10 +2952,9 @@ cat << 'END_OF_FILE_CONTENT' > "src/App.tsx"
  * Bootstrap, persistence, and engine wiring — logic lives in lib/hooks.
  */
 import { useEffect, useMemo } from 'react';
-import { JsonPagesEngine } from '@olonjs/core';
+import { JsonPagesEngine, OlonFormsContext } from '@olonjs/react';
 import type { JsonPagesConfig, ProjectState } from '@olonjs/core';
 import { withBasePath } from '@olonjs/core';
-import { OlonFormsContext } from '@olonjs/core';
 import { ComponentRegistry } from '@/lib/ComponentRegistry';
 import { CollectionRegistry } from '@/lib/CollectionRegistry';
 import { SECTION_SCHEMAS } from '@/lib/schemas';
@@ -3052,6 +3061,8 @@ function App() {
     bootstrap.isHotSaveMode || Object.keys(bootstrap.collections).length > 0
       ? bootstrap.collections
       : fileCollections;
+
+      // TOASK: why this if we have a menuConfig Object?
   const engineRefDocuments = useMemo(
     () => ({
       'menu.json': bootstrap.menuConfig,
@@ -3060,7 +3071,7 @@ function App() {
     }),
     [bootstrap.menuConfig],
   );
-
+  // TOASK END
   const config: JsonPagesConfig = {
     tenantId: TENANT_ID,
     basePath: APP_BASE_PATH,
@@ -4077,7 +4088,7 @@ END_OF_FILE_CONTENT
 echo "Creating src/components/form-demo/View.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/form-demo/View.tsx"
 import { Icon } from '@/lib/IconResolver';
-import { useFormState } from '@olonjs/core';
+import { useFormState } from '@olonjs/react';
 import type { FormDemoData } from './types';
 
 type FormDemoViewProps = {
@@ -5622,7 +5633,8 @@ import {
   Code2, Quote, SquareCode,
   Link2, Unlink2, ImagePlus, Eraser,
 } from 'lucide-react';
-import { STUDIO_EVENTS, useConfig, useStudio } from '@olonjs/core';
+import { STUDIO_EVENTS } from '@olonjs/core';
+import { useConfig, useStudio } from '@olonjs/react';
 import type { TiptapData, TiptapSettings } from './types';
 
 // ── UI primitives ─────────────────────────────────────────────────
@@ -8582,7 +8594,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/data/collections/libri/libri.json"
     "id": "1984",
     "title": "1984",
     "author": {
-      "$ref": "../autori/autori.json#/alessandro-baricco"
+      "$ref": "../autori/autori.json#/george-orwell"
     },
     "year": 1949,
     "genre": "Distopia",
@@ -9686,14 +9698,8 @@ echo "Creating src/entry-ssg.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/entry-ssg.tsx"
 import { renderToString } from 'react-dom/server';
 import { StaticRouter } from 'react-router-dom/server';
-import {
-  ConfigProvider,
-  PageRenderer,
-  StudioProvider,
-  contract,
-  resolvePageMatchFromRegistry,
-  resolveRuntimeConfig,
-} from '@olonjs/core';
+import { ConfigProvider, PageRenderer, StudioProvider } from '@olonjs/react';
+import { contract, resolvePageMatchFromRegistry, resolveRuntimeConfig } from '@olonjs/core';
 import type { JsonPagesConfig, PageConfig, SiteConfig, ThemeConfig } from '@/types';
 import { ThemeProvider } from '@/components/ThemeProvider';
 import { ComponentRegistry } from '@/lib/ComponentRegistry';
@@ -11445,7 +11451,6 @@ export function coerceSiteConfig(value: unknown): SiteConfig | null {
   }
   if (!isObjectRecord(input)) return null;
   if (!isObjectRecord(input.identity)) return null;
-  if (!Array.isArray(input.pages)) return null;
 
   return input as unknown as SiteConfig;
 }
@@ -11712,7 +11717,6 @@ export function getHydratedData(
 }
 
 END_OF_FILE_CONTENT
-mkdir -p "src/lib/editorial"
 echo "Creating src/lib/getFileCollections.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/lib/getFileCollections.ts"
 import type { JsonPagesConfig } from '@/types';
@@ -12940,8 +12944,9 @@ function isRemoteStylesheetHref(value: string): boolean {
 export function extractLeadingRemoteCssImports(cssText: string): { hrefs: string[]; rest: string } {
   const hrefs = new Set<string>();
   const leadingTriviaPattern = /^(?:\s+|\/\*[\s\S]*?\*\/)*/;
+  // Vite/Tailwind may emit `@import url("...")` or compacted `@import"https://..."`.
   const importPattern =
-    /^@import\s+url\(\s*(?:'([^']+)'|"([^"]+)"|([^'")\s][^)]*))\s*\)\s*([^;]*);/i;
+    /^@import(?:\s*url\(\s*(?:'([^']+)'|"([^"]+)"|([^'")\s][^)]*))\s*\)|\s*(['"])([^'"]+)\4)\s*([^;]*);/i;
   let rest = cssText;
 
   for (;;) {
@@ -12953,8 +12958,8 @@ export function extractLeadingRemoteCssImports(cssText: string): { hrefs: string
     const match = rest.match(importPattern);
     if (!match) break;
 
-    const href = (match[1] ?? match[2] ?? match[3] ?? '').trim();
-    const trailingDirectives = (match[4] ?? '').trim();
+    const href = (match[1] ?? match[2] ?? match[3] ?? match[5] ?? '').trim();
+    const trailingDirectives = (match[6] ?? '').trim();
 
     if (!isRemoteStylesheetHref(href) || trailingDirectives.length > 0) {
       break;
@@ -13484,7 +13489,7 @@ END_OF_FILE_CONTENT
 echo "Creating src/lib/useOlonForms.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/lib/useOlonForms.ts"
 import { useCallback, useEffect, useState } from 'react';
-import type { FormState } from '@olonjs/core';
+import type { FormState } from '@olonjs/react';
 
 const API_BASE =
   (import.meta.env.VITE_OLONJS_CLOUD_URL as string | undefined) ??

package/assets/templates/alpha/src_tenant.sh

@@ -1817,11 +1817,14 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
     "@tiptap/extension-link": "^2.11.5",
     "@tiptap/react": "^2.11.5",
     "@tiptap/starter-kit": "^2.11.5",
-    "@olonjs/core": "^1.1.16",
+    "@olonjs/core": "^1.1.18",
+    "@olonjs/react": "^0.1.1",
+    "@olonjs/studio": "^0.1.1",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
     "motion": "^12.23.24",
+    "radix-ui": "^1.4.3",
     "react": "^19.0.0",
     "react-markdown": "^9.0.1",
     "react-dom": "^19.0.0",
@@ -2191,8 +2194,6 @@ async function readJsonFile(filePath) {
 }
 
 async function expandCollectionTarget(slug, pageFilePath) {
-  if (!/\[[^\]]+\]/.test(slug)) return [slug];
-
   let pageConfig;
   try {
     pageConfig = await readJsonFile(pageFilePath);
@@ -2206,7 +2207,14 @@ async function expandCollectionTarget(slug, pageFilePath) {
   }
 
   const token = `[${binding.paramKey}]`;
-  if (!slug.includes(token)) return [slug];
+  // Prefer authored route pattern (page.slug) when the file path is not parametric.
+  const authoredSlug =
+    typeof pageConfig.slug === 'string'
+      ? pageConfig.slug.replace(/\\/g, '/').replace(/^\/+|\/+$/g, '')
+      : '';
+  const routePattern =
+    authoredSlug.includes(token) ? authoredSlug : slug.includes(token) ? slug : '';
+  if (!routePattern) return [slug];
 
   const collectionPath = path.resolve(collectionsDir, binding.source, `${binding.source}.json`);
   let collection;
@@ -2218,7 +2226,9 @@ async function expandCollectionTarget(slug, pageFilePath) {
 
   if (!collection || typeof collection !== 'object' || Array.isArray(collection)) return [slug];
   const itemIds = Object.keys(collection).sort((a, b) => a.localeCompare(b));
-  return itemIds.length > 0 ? itemIds.map((itemId) => slug.replace(token, itemId)) : [slug];
+  return itemIds.length > 0
+    ? itemIds.map((itemId) => routePattern.replace(token, itemId))
+    : [slug];
 }
 
 async function listJsonFilesRecursive(dir) {
@@ -2942,10 +2952,9 @@ cat << 'END_OF_FILE_CONTENT' > "src/App.tsx"
  * Bootstrap, persistence, and engine wiring — logic lives in lib/hooks.
  */
 import { useEffect, useMemo } from 'react';
-import { JsonPagesEngine } from '@olonjs/core';
+import { JsonPagesEngine, OlonFormsContext } from '@olonjs/react';
 import type { JsonPagesConfig, ProjectState } from '@olonjs/core';
 import { withBasePath } from '@olonjs/core';
-import { OlonFormsContext } from '@olonjs/core';
 import { ComponentRegistry } from '@/lib/ComponentRegistry';
 import { CollectionRegistry } from '@/lib/CollectionRegistry';
 import { SECTION_SCHEMAS } from '@/lib/schemas';
@@ -3052,6 +3061,8 @@ function App() {
     bootstrap.isHotSaveMode || Object.keys(bootstrap.collections).length > 0
       ? bootstrap.collections
       : fileCollections;
+
+      // TOASK: why this if we have a menuConfig Object?
   const engineRefDocuments = useMemo(
     () => ({
       'menu.json': bootstrap.menuConfig,
@@ -3060,7 +3071,7 @@ function App() {
     }),
     [bootstrap.menuConfig],
   );
-
+  // TOASK END
   const config: JsonPagesConfig = {
     tenantId: TENANT_ID,
     basePath: APP_BASE_PATH,
@@ -4077,7 +4088,7 @@ END_OF_FILE_CONTENT
 echo "Creating src/components/form-demo/View.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/form-demo/View.tsx"
 import { Icon } from '@/lib/IconResolver';
-import { useFormState } from '@olonjs/core';
+import { useFormState } from '@olonjs/react';
 import type { FormDemoData } from './types';
 
 type FormDemoViewProps = {
@@ -5622,7 +5633,8 @@ import {
   Code2, Quote, SquareCode,
   Link2, Unlink2, ImagePlus, Eraser,
 } from 'lucide-react';
-import { STUDIO_EVENTS, useConfig, useStudio } from '@olonjs/core';
+import { STUDIO_EVENTS } from '@olonjs/core';
+import { useConfig, useStudio } from '@olonjs/react';
 import type { TiptapData, TiptapSettings } from './types';
 
 // ── UI primitives ─────────────────────────────────────────────────
@@ -8582,7 +8594,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/data/collections/libri/libri.json"
     "id": "1984",
     "title": "1984",
     "author": {
-      "$ref": "../autori/autori.json#/alessandro-baricco"
+      "$ref": "../autori/autori.json#/george-orwell"
     },
     "year": 1949,
     "genre": "Distopia",
@@ -9686,14 +9698,8 @@ echo "Creating src/entry-ssg.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/entry-ssg.tsx"
 import { renderToString } from 'react-dom/server';
 import { StaticRouter } from 'react-router-dom/server';
-import {
-  ConfigProvider,
-  PageRenderer,
-  StudioProvider,
-  contract,
-  resolvePageMatchFromRegistry,
-  resolveRuntimeConfig,
-} from '@olonjs/core';
+import { ConfigProvider, PageRenderer, StudioProvider } from '@olonjs/react';
+import { contract, resolvePageMatchFromRegistry, resolveRuntimeConfig } from '@olonjs/core';
 import type { JsonPagesConfig, PageConfig, SiteConfig, ThemeConfig } from '@/types';
 import { ThemeProvider } from '@/components/ThemeProvider';
 import { ComponentRegistry } from '@/lib/ComponentRegistry';
@@ -11445,7 +11451,6 @@ export function coerceSiteConfig(value: unknown): SiteConfig | null {
   }
   if (!isObjectRecord(input)) return null;
   if (!isObjectRecord(input.identity)) return null;
-  if (!Array.isArray(input.pages)) return null;
 
   return input as unknown as SiteConfig;
 }
@@ -11712,7 +11717,6 @@ export function getHydratedData(
 }
 
 END_OF_FILE_CONTENT
-mkdir -p "src/lib/editorial"
 echo "Creating src/lib/getFileCollections.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/lib/getFileCollections.ts"
 import type { JsonPagesConfig } from '@/types';
@@ -12940,8 +12944,9 @@ function isRemoteStylesheetHref(value: string): boolean {
 export function extractLeadingRemoteCssImports(cssText: string): { hrefs: string[]; rest: string } {
   const hrefs = new Set<string>();
   const leadingTriviaPattern = /^(?:\s+|\/\*[\s\S]*?\*\/)*/;
+  // Vite/Tailwind may emit `@import url("...")` or compacted `@import"https://..."`.
   const importPattern =
-    /^@import\s+url\(\s*(?:'([^']+)'|"([^"]+)"|([^'")\s][^)]*))\s*\)\s*([^;]*);/i;
+    /^@import(?:\s*url\(\s*(?:'([^']+)'|"([^"]+)"|([^'")\s][^)]*))\s*\)|\s*(['"])([^'"]+)\4)\s*([^;]*);/i;
   let rest = cssText;
 
   for (;;) {
@@ -12953,8 +12958,8 @@ export function extractLeadingRemoteCssImports(cssText: string): { hrefs: string
     const match = rest.match(importPattern);
     if (!match) break;
 
-    const href = (match[1] ?? match[2] ?? match[3] ?? '').trim();
-    const trailingDirectives = (match[4] ?? '').trim();
+    const href = (match[1] ?? match[2] ?? match[3] ?? match[5] ?? '').trim();
+    const trailingDirectives = (match[6] ?? '').trim();
 
     if (!isRemoteStylesheetHref(href) || trailingDirectives.length > 0) {
       break;
@@ -13484,7 +13489,7 @@ END_OF_FILE_CONTENT
 echo "Creating src/lib/useOlonForms.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/lib/useOlonForms.ts"
 import { useCallback, useEffect, useState } from 'react';
-import type { FormState } from '@olonjs/core';
+import type { FormState } from '@olonjs/react';
 
 const API_BASE =
   (import.meta.env.VITE_OLONJS_CLOUD_URL as string | undefined) ??

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@olonjs/cli",
-    "version": "3.0.149",
+    "version": "3.0.151",
     "description": "The Sovereign CLI Engine for OlonJS.",
     "type": "module",
     "bin": {