@jucie.io/cli 1.0.5 → 1.0.7

package/dist/stage-src/dev/server.js

@@ -1,37 +1,47 @@
-import { Result } from '@brickworks/result';
-import { existsSync } from 'node:fs';
+import { Result } from '@jucie.io/result';
 import { join } from 'node:path';
 
 import { Engine } from '@jucie.io/engine';
 import { Server } from '@jucie.io/engine-server';
-import { State } from '@jucie.io/state';
+import { State } from '@jucie.io/engine-state';
 import { Matcher } from '@jucie.io/state-matcher';
 import { EsBuild } from '@jucie.io/engine-esbuild';
-import { CAS, DEFAULT_NAMESPACES } from '@packages/engine-cas';
+import { CAS } from '@packages/engine-cas';
 import { StoreParser } from '@packages/engine-store-parser';
+import { ledgerCasConfig, ledgerTombstonesCasConfig } from '@packages/stage/cas/ledger.js';
+import { nodesCasConfig, animationsCasConfig, tokensCasConfig } from '@packages/stage/cas/sceneGraph.js';
 
-import { devConfig } from './config.js';
-import { componentsConfig, hasProjectCode } from './componentsConfig.js';
+import { watchDevCombined } from '../../esbuild/wiring/watchDevCombined.js';
+import { watchProject } from '../../esbuild/wiring/watchProject.js';
+import { hasProjectCode } from '../../esbuild/hasProjectCode.js';
+import { resolvePrebuiltStageDir } from '../../esbuild/resolvePrebuiltStageDir.js';
 
-import { jucieScenePlugin, onRebuildPlugin, componentsDirectoryPlugin, jucieSdkPlugin, jucieMainPlugin, createBuildStatusPlugin, prebuiltExternalsPlugin } from '../../plugins/main.js';
-
-import devRoutes from './routes/dev.js';
-import jsRoutes from './routes/js.js';
+import render from '../../views/design.js';
+import shellRoutes from '../../routes/shell.js';
+import jsRoutes from '../../routes/js.js';
 
 export async function createDevServer(opts = {}) {
   let log = { error() {}, warn() {}, info() {}, debug() {} };
   let engine = null;
   try {
     const framework = opts.framework || 'react';
-    const prebuiltDir = opts.stageBundles ? join(opts.stageBundles, framework) : null;
-    opts.prebuiltStageDir = prebuiltDir && existsSync(join(prebuiltDir, 'entry.js'))
-      ? prebuiltDir
-      : null;
+    opts.prebuiltStageDir = resolvePrebuiltStageDir(opts.stageBundles, framework);
 
-    const state = State.create().install(Matcher);
-    engine = Engine.create({ state }).install(
+    engine = Engine.create().install(
+      State.configure({ plugins: [Matcher] }),
       Server.configure(opts),
-      CAS.configure({ ...opts, namespaces: DEFAULT_NAMESPACES }),
+      CAS.configure({
+        storage: {
+          name: 'state',
+          provider: opts.storageProvider ?? 'local',
+          root: opts.projectRoot ?? opts.sceneGraph,
+          mode: 'path',
+          ...(opts.storageConfig ?? {}),
+        },
+        branch: opts.branch || 'main',
+        namespaces: opts.namespaces ?? {},
+        configs: [ledgerCasConfig, ledgerTombstonesCasConfig, nodesCasConfig, animationsCasConfig, tokensCasConfig],
+      }),
       StoreParser.configure(opts),
       EsBuild.configure(opts),
     );
@@ -43,34 +53,18 @@ export async function createDevServer(opts = {}) {
     const needsProjectBuild = opts.prebuiltStageDir ? hasProjectCode(opts) : true;
     let resolveFirstBuild;
     const firstBuild = new Promise((resolve) => { resolveFirstBuild = resolve; });
-    const buildStatusPlugin = createBuildStatusPlugin({ onFirstBuild: resolveFirstBuild });
 
     if (opts.prebuiltStageDir) {
       if (needsProjectBuild) {
-        engine.esBuild.use(
-          componentsConfig,
-          componentsDirectoryPlugin,
-          jucieMainPlugin,
-          prebuiltExternalsPlugin,
-          onRebuildPlugin,
-          buildStatusPlugin
-        );
+        watchProject(engine, { onFirstBuild: resolveFirstBuild });
       }
     } else {
-      engine.esBuild.use(
-        devConfig,
-        componentsDirectoryPlugin,
-        jucieSdkPlugin,
-        jucieMainPlugin,
-        jucieScenePlugin,
-        onRebuildPlugin,
-        buildStatusPlugin
-      );
+      watchDevCombined(engine, { onFirstBuild: resolveFirstBuild });
     }
 
     engine.server.use(
-      jsRoutes,
-      devRoutes
+      jsRoutes('dev'),
+      shellRoutes(render)
     );
 
     const CORS_HEADERS = {
@@ -88,7 +82,9 @@ export async function createDevServer(opts = {}) {
     });
 
     await engine.server.listen();
-    await engine.cas.loadScene();
+    const casData = await engine.cas.load();
+    const { ledger, ledgerTombstones, ...sceneData } = casData;
+    engine.state.load(sceneData);
     await engine.storeParser.start();
 
     if (needsProjectBuild) {

package/dist/stage-src/preview/bootstrap.js

@@ -1,25 +1,22 @@
-import { Engine } from '@jucie.io/engine';
 import { SceneCompiler } from '@packages/engine-scene-compiler';
-import { State } from '@jucie.io/state';
-import { JucieState } from '@jucie.io/reactive-jucie-state';
+import { State } from '@jucie.io/engine-state';
+import { Reactive } from '@jucie.io/state-reactive';
 import { PROTOTYPES } from '@packages/scene-graph/nodes/prototypes/main.js';
 
-export const createLivePreviewBootstrap = ({ config = {} } = {}) => new Promise(async (resolve, reject) => {
-  try {
-    const { loadProjectMain } = await import('jucie:sdk');
-    await loadProjectMain();
-    const { scene } = await import('jucie:scene');
-    const sources = (await import('@components'))?.default ?? {};
+export const createLivePreviewBootstrap = async (engine, { config = {} } = {}) => {
+  const { loadProjectMain } = await import('jucie:sdk');
+  await loadProjectMain();
+  const { scene } = await import('jucie:scene');
+  const sources = (await import('@components'))?.default ?? {};
 
-    const state = State.create(scene).install(JucieState);
-    const engine = Engine.create({ state }).install(SceneCompiler.configure(config));
+  engine.install(
+    State.configure({ state: scene, plugins: [Reactive] }),
+    SceneCompiler.configure(config)
+  );
 
-    engine.sceneCompiler.loadPrototypes(PROTOTYPES);
-    engine.sceneCompiler.loadSources(sources);
-    engine.sceneCompiler.create('app');
+  engine.sceneCompiler.loadPrototypes(PROTOTYPES);
+  engine.sceneCompiler.loadSources(sources);
+  engine.sceneCompiler.create('app');
 
-    resolve(config)
-  } catch (error) {
-    reject(error)
-  }
-})
+  return config;
+};

package/dist/stage-src/preview/entry.js

@@ -1,4 +1,5 @@
+import { Engine } from '@jucie.io/engine';
 import { jucieConfig } from 'jucie:config';
 import { createLivePreviewBootstrap } from './bootstrap.js';
 
-createLivePreviewBootstrap({ config: jucieConfig });
+createLivePreviewBootstrap(Engine.create(), { config: jucieConfig });

package/dist/stage-src/preview/routes/js.js

@@ -2,8 +2,8 @@ import { defineRoutes } from '@jucie.io/engine-server';
 import { resolve } from 'path';
 import render from '../views/index.js';
 
-export default defineRoutes('js', (useContext, config) => {
-  const log = useContext('log');
+export default defineRoutes('js', (inject, config) => {
+  const log = inject('log');
 
   return [
   {
@@ -47,7 +47,7 @@ export default defineRoutes('js', (useContext, config) => {
     method: 'get',
     path: '/assets/*',
     handler: ({ res, respond }) => {
-      const cache = useContext('cache')
+      const cache = inject('cache')
       const sseClients = cache.get(['sseClients']) && new Set();
       try {
         res.setHeader('Content-Type', 'text/event-stream');
@@ -75,7 +75,7 @@ export default defineRoutes('js', (useContext, config) => {
     method: 'get',
     path: '/hmr',
     handler: ({ res, respond }) => {
-      const cache = useContext('cache')
+      const cache = inject('cache')
       try {
         
         res.setHeader('Content-Type', 'text/event-stream');

package/dist/stage-src/preview/routes/preview.js

@@ -1,8 +1,8 @@
 import { defineRoutes } from '@jucie.io/engine-server';
 import render from '../views/index.js';
 
-export default defineRoutes('design', (useContext, config) => {
-  const log = useContext('log');
+export default defineRoutes('design', (inject, config) => {
+  const log = inject('log');
 
   return [
   {

package/dist/stage-src/preview/server.js

@@ -1,21 +1,30 @@
 
-import { Result } from '@brickworks/result';
+import { Result } from '@jucie.io/result';
 
 // Engine Extensions
 import { Engine } from '@jucie.io/engine';
 import { Server } from '@jucie.io/engine-server';
 
 // State/Cache
-import { State } from '@jucie.io/state';
+import { State } from '@jucie.io/engine-state';
 import { Matcher } from '@jucie.io/state-matcher';
 
 // Extensions
 import { EsBuild } from '@jucie.io/engine-esbuild';
 import { CAS } from '@packages/engine-cas';
 import { StoreParser } from '@packages/engine-store-parser';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { ledgerCasConfig, ledgerTombstonesCasConfig } from '@packages/stage/cas/ledger.js';
+import { nodesCasConfig, animationsCasConfig, tokensCasConfig } from '@packages/stage/cas/sceneGraph.js';
 
-import { previewConfig } from './config.js';
-import { jucieScenePlugin, jucieConfigPlugin, onRebuildPlugin, componentsDirectoryPlugin, jucieSdkPlugin, jucieMainPlugin } from '../../plugins/main.js';
+import { appConfig } from '../../esbuild/products/appConfig.js';
+import { resolveComponents } from '../../esbuild/plugins/resolveComponents.js';
+import { resolveSdk } from '../../esbuild/plugins/resolveSdk.js';
+import { resolveMain } from '../../esbuild/plugins/resolveMain.js';
+import { resolveScene } from '../../esbuild/plugins/resolveScene.js';
+import { resolveConfig } from '../../esbuild/plugins/resolveConfig.js';
+import { onRebuild } from '../../esbuild/plugins/onRebuild.js';
 
 
 // Routes
@@ -25,27 +34,41 @@ import jsRoutes from './routes/js.js';
 export async function createPreviewServer(opts = {}) {
   let log = { error() {}, warn() {}, info() {}, debug() {} };
   try {
-    const state = State.create().install(Matcher);
-    const engine = Engine.create({ state }).install(
+    const engine = Engine.create().install(
+      State.configure({ plugins: [Matcher] }),
       Server.configure(opts),
-      CAS.configure(opts),
+      CAS.configure({
+        storage: {
+          name: 'state',
+          provider: opts.storageProvider ?? 'local',
+          root: opts.projectRoot ?? opts.sceneGraph,
+          mode: 'path',
+          ...(opts.storageConfig ?? {}),
+        },
+        branch: opts.branch || 'main',
+        namespaces: opts.namespaces ?? {},
+        configs: [ledgerCasConfig, ledgerTombstonesCasConfig, nodesCasConfig, animationsCasConfig, tokensCasConfig],
+      }),
       StoreParser.configure(opts),
       EsBuild.configure(opts)
     );
 
     log = engine.log.child({ ns: 'stage:preview' });
 
-    engine.cache.set(['jucieConfig'], opts);
+    engine.cache.set(['jucieConfig'], {
+      ...opts,
+      appEntry: join(dirname(fileURLToPath(import.meta.url)), 'entry.js'),
+      sourcemap: true,
+    });
 
-    // Set up compiler
     engine.esBuild.use(
-      previewConfig,
-      componentsDirectoryPlugin,
-      jucieSdkPlugin,
-      jucieMainPlugin,
-      jucieScenePlugin,
-      jucieConfigPlugin,
-      onRebuildPlugin
+      appConfig,
+      resolveComponents,
+      resolveSdk,
+      resolveMain,
+      resolveScene,
+      resolveConfig,
+      onRebuild,
     );
 
     engine.server.use(
@@ -54,7 +77,9 @@ export async function createPreviewServer(opts = {}) {
     );
 
     // Start the server
-    await engine.cas.loadScene();
+    const casData = await engine.cas.load();
+    const { ledger, ledgerTombstones, ...sceneData } = casData;
+    engine.state.load(sceneData);
     await engine.storeParser.start();
     await engine.esBuild.build();
     await engine.server.listen();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jucie.io/cli",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "CLI tool for creating and managing Jucie projects",
   "type": "module",
   "bin": {
@@ -23,8 +23,9 @@
     "build:prod": "NODE_ENV=production node build.js",
     "dev": "node build.js && npm link",
     "watch": "node --watch build.js",
-    "test": "vitest run",
+    "test": "npm run build && vitest run",
     "test:watch": "vitest watch",
+    "test:integration": "vitest run --config vitest.integration.config.js",
     "test:e2e": "vitest run __tests__/cli.e2e.test.js",
     "test:bundle": "vitest run __tests__/bundle.test.js",
     "test:pack": "vitest run __tests__/pack.test.js",
@@ -60,17 +61,18 @@
   },
   "dependencies": {
     "@babel/parser": "^7.29.0",
-    "@jucie.io/engine": "^1.1.77",
-    "@jucie.io/engine-esbuild": "^1.0.16",
-    "@jucie.io/engine-message": "^1.0.35",
-    "@jucie.io/engine-server": "^1.0.34",
-    "@jucie.io/engine-socket": "^1.0.23",
-    "@jucie.io/reactive": "^1.0.43",
-    "@jucie.io/reactive-jucie-state": "^1.0.21",
-    "@jucie.io/state": "^1.0.30",
-    "@jucie.io/state-history": "^1.0.20",
-    "@jucie.io/state-matcher": "^1.0.18",
-    "@jucie.io/state-on-change": "^1.0.18",
+    "@jucie.io/engine": "^1.1.79",
+    "@jucie.io/engine-esbuild": "^1.0.18",
+    "@jucie.io/engine-message": "^1.0.37",
+    "@jucie.io/engine-server": "^1.0.36",
+    "@jucie.io/engine-socket": "^1.1.0",
+    "@jucie.io/engine-state": "^1.0.2",
+    "@jucie.io/reactive": "^1.0.45",
+    "@jucie.io/state-reactive": "^1.0.2",
+    "@jucie.io/state": "^1.0.32",
+    "@jucie.io/state-history": "^1.0.22",
+    "@jucie.io/state-matcher": "^1.0.20",
+    "@jucie.io/state-on-change": "^1.0.20",
     "chokidar": "^3.6.0",
     "esbuild": "^0.20.0",
     "glob": "^13.0.0",
@@ -78,15 +80,15 @@
     "recast": "^0.23.0"
   },
   "devDependencies": {
-    "@brickworks/result": "^2.0.2",
+    "@jucie.io/result": "^2.0.2",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@packages/ai-tools": "*",
     "@packages/engine-ai": "*",
-    "@packages/engine-cas": "*",
     "@packages/engine-font-resolver": "*",
     "@packages/engine-scene-compiler": "*",
     "@packages/engine-static-assets": "*",
     "@packages/jucie-sdk": "*",
+    "@packages/project": "*",
     "@packages/scene-graph": "*",
     "@packages/stage": "*",
     "@packages/engine-store-parser": "*",
@@ -94,7 +96,7 @@
     "nanoid": "^3.3.11",
     "path-scurry": "^1.10.1",
     "terser": "^5.36.0",
-    "vitest": "^1.0.0",
+    "vitest": "^1.6.1",
     "zod": "^3.25.0"
   }
 }

package/dist/stage/chunks/addAttribute-CNJGHQSS.js

@@ -1 +0,0 @@
-import{a}from"./chunk-5YRZZCXL.js";import"./chunk-TV4PHWEG.js";import"./chunk-ODSNVDNS.js";import"./chunk-BVAPODQ7.js";import"./chunk-5PUPZLDN.js";import"./chunk-4XNQRZ5E.js";import"./chunk-K7MC6G4X.js";export{a as addAttribute};

package/dist/stage/chunks/addNode-AOA2MS25.js

@@ -1 +0,0 @@
-import{b as a}from"./chunk-6GMURG26.js";import"./chunk-AMAA7VJU.js";import"./chunk-N4AFW5M3.js";import"./chunk-5SOTDESD.js";import"./chunk-2YZN7IFG.js";import"./chunk-X2DYJVYZ.js";import"./chunk-ZEWKYCOX.js";import"./chunk-MXIF2FGR.js";import"./chunk-LR6DSVPP.js";import"./chunk-BVAPODQ7.js";import"./chunk-5PUPZLDN.js";import"./chunk-4XNQRZ5E.js";import"./chunk-GG4NWMR6.js";import"./chunk-K7MC6G4X.js";export{a as addNode};

package/dist/stage/chunks/aiRelay-FSM6HGF7.js

@@ -1 +0,0 @@
-import"./chunk-4FPLUVEY.js";import{c as m}from"./chunk-AMAA7VJU.js";import{a as u}from"./chunk-K7MC6G4X.js";import{defineContracts as I}from"@jucie.io/engine-message";function h(s,r,e){let t=e.get(["selectedRids"])??[],l=s.get(["nodes"])??{},i=t.length>0?r.getIds(t):[],p=t.length>0?w(l,i,t,r):b(r);return{framework:e.get(["config","framework"])??"react",componentCatalog:r.getMeta(),stores:s.get(["stores"])??{},tokens:s.get(["tokens"])??{},animations:s.get(["animations"])??{},...p,availableFrames:m(),layoutHints:P(l,t)}}u(h,"buildAiContext");function b(s){return{scope:"global",jsx:s.projectPuppetJsx("app",{maxDepth:8})}}u(b,"buildGlobalContext");function w(s,r,e,t){let l=k(s,r[0])??"app";return{scope:"local",selectedIds:r,jsx:t.projectPuppetJsx(l)}}u(w,"buildLocalContext");function P(s,r){let e={viewportPositions:[],usedPositions:[],containerLayouts:{},suggestedViewportPosition:null},t=0;return Object.entries(s).forEach(([l,i])=>{if(i.type==="frame"&&i.bounds){let{top:p,left:g,width:f,height:n}=i.bounds,o={id:l,name:i.name,top:p||0,left:g||0,width:f||375,height:n||667};e.viewportPositions.push(o);let a=o.left+o.width;a>t&&(t=a)}if(i.type!=="frame"&&i.style?.default?.position==="absolute"){let{top:p,left:g,width:f,height:n}=i.style.default;e.usedPositions.push({id:l,top:parseInt(p)||0,left:parseInt(g)||0,width:parseInt(f)||100,height:parseInt(n)||50})}(i.layout==="flex"||i.style?.default?.display==="flex")&&(e.containerLayouts[l]="flex"),(i.layout==="grid"||i.style?.default?.display==="grid")&&(e.containerLayouts[l]="grid")}),e.suggestedViewportPosition={top:0,left:t+50},e}u(P,"buildLayoutHints");function v(s,r){for(let[e,t]of Object.entries(s))if(t.children?.includes(r))return e;return null}u(v,"findParent");function k(s,r){let e=r;for(;e;){let t=s[e];if(!t)return null;if(t.type==="frame")return e;e=v(s,e)}return null}u(k,"findFrameAncestor");var R=5e3,E=I("ai",s=>{let[r,e,t,l,i,p,g]=s("channel","state","sceneCompiler","cache","socket","log","aiOps");function f(o=R){return new Promise(a=>{let c=setTimeout(()=>{d(),a(null)},o),d=t.addNodeGraphListener((y,x)=>{clearTimeout(c),d(),a({updated:y,removed:x})})})}u(f,"waitForRender");let n=i.get();return n.on("stage:ai:progress",o=>{r.to("editor").publish("ai:progress",o)}),n.on("stage:ai:response",o=>{r.to("editor").publish("ai:response",o)}),n.on("stage:ai:context:capture",async({requestId:o,awaitRender:a}={})=>{try{a&&await f();let c=h(e,t,l);n.emit("server:ai:result",{requestId:o,result:c})}catch(c){p.error("ai context capture failed",{error:c.message}),n.emit("server:ai:result",{requestId:o,error:c.message})}}),n.on("stage:ai:operations:execute",async({requestId:o,batch:a}={})=>{try{e.history.group();let c;try{c=await g.executeBatch(a??{operations:[]})}finally{e.history.commit(a?.description||a?.message||"AI changes")}n.emit("server:ai:result",{requestId:o,result:c})}catch(c){p.error("ai operations execute failed",{error:c.message}),n.emit("server:ai:result",{requestId:o,error:c.message})}}),{agent:{schema:["String","Object"],namespace:"stage",timeoutMs:18e4,handler:async(o,a={})=>{n.emit("server:ai:agent",{prompt:o,sessionId:a.sessionId??null,token:l.get(["token"])??null})}},stop:{schema:[],namespace:"stage",handler:()=>{n.emit("server:ai:stop")}}}});export{E as aiContracts};

package/dist/stage/chunks/assets-OAQXQVKM.js

@@ -1 +0,0 @@
-import{a as c}from"./chunk-K7MC6G4X.js";import{defineContracts as l}from"@jucie.io/engine-message";var p=l("assets",d=>{let[s,a,o]=d("socket","channel","log");if(!s||!a)throw new Error("Socket or channel not found");return{upload:{namespace:"stage",schema:["Object","ArrayBuffer"],handler:async(r,n)=>{o.debug("upload request received",{name:r.name});try{s.get().emit("server:upload:asset",{meta:r,data:n});let e=c(t=>{o.debug("upload response received",{success:t.success}),a.to("editor").publish("asset:uploaded",t),s.get().off("stage:asset:uploaded",e)},"responseHandler");s.get().on("stage:asset:uploaded",e)}catch(e){o.error("upload failed",{error:e.message}),a.to("editor").publish("asset:uploaded",{success:!1,error:e.message})}}}}});export{p as assetsContracts};