@shipfox/client-shell 4.0.0 → 6.0.1

package/dist/vite/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/vite/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAiB,MAAM,MAAM,CAAC;AASjD,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAID,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,GAAgC,GACjC,EAAE,+BAA+B,GAAG,MAAM,CA+E1C"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/vite/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAiB,MAAM,MAAM,CAAC;AAKjD,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAID,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,GAAgC,GACjC,EAAE,+BAA+B,GAAG,MAAM,CAqE1C"}

package/dist/vite/plugin.js

@@ -1,10 +1,6 @@
 import { mkdir, readFile, realpath, writeFile } from 'node:fs/promises';
 import { dirname, resolve } from 'node:path';
-import { composeRoutes } from '#compose/compose-routes.js';
-import { mergeConfigShapes } from '#compose/merge-config.js';
-import { validateProviderIds } from '#compose/validate-providers.js';
-import { validateNavigation, validateSettingsSections } from '#compose/validate-registries.js';
-import { navigationEntries, settingsEntries } from '#runtime/registries.js';
+import { composeClientFeatures } from '#compose/compose-client-features.js';
 import { evaluateFeatures } from './evaluate-features.js';
 import { generateAppModule } from './generate.js';
 export function shipfoxClientComposition({ features, out = './src/shipfox-app.gen.ts' }) {
@@ -22,18 +18,14 @@ export function shipfoxClientComposition({ features, out = './src/shipfox-app.ge
     }
     async function generate({ addWatchFile, resolveRoute }) {
         const evaluated = await evaluateFeatures(featuresPath());
-        const routes = composeRoutes(evaluated.features);
-        validateProviderIds(evaluated.features);
-        validateNavigation(evaluated.features, routes.map((route)=>route.path));
-        validateSettingsSections(evaluated.features, routes.map((route)=>route.path));
-        mergeConfigShapes(evaluated.features);
-        await assertRoutesResolve(resolveRoute, routes);
+        const composition = composeClientFeatures(evaluated.features);
+        await assertRoutesResolve(resolveRoute, composition.routes);
         watchedFiles = new Set(evaluated.loadedFiles);
         for (const file of watchedFiles)addWatchFile(file);
         const output = generateAppModule({
-            routes,
-            navigation: navigationEntries(evaluated.features),
-            settingsSections: settingsEntries(evaluated.features)
+            routes: composition.routes,
+            navigation: composition.navigation,
+            settingsSections: composition.settingsSections
         });
         const path = outputPath();
         const existing = await readFile(path, 'utf8').catch(()=>undefined);

package/dist/vite/plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/vite/plugin.ts"],"sourcesContent":["import {mkdir, readFile, realpath, writeFile} from 'node:fs/promises';\nimport {dirname, resolve} from 'node:path';\nimport type {Plugin, ResolvedConfig} from 'vite';\nimport {composeRoutes} from '#compose/compose-routes.js';\nimport {mergeConfigShapes} from '#compose/merge-config.js';\nimport {validateProviderIds} from '#compose/validate-providers.js';\nimport {validateNavigation, validateSettingsSections} from '#compose/validate-registries.js';\nimport {navigationEntries, settingsEntries} from '#runtime/registries.js';\nimport {evaluateFeatures} from './evaluate-features.js';\nimport {generateAppModule} from './generate.js';\n\nexport interface ShipfoxClientCompositionOptions {\n  features: string;\n  out?: string;\n}\n\ntype RouteResolver = (source: string, importer?: string) => Promise<{id: string} | null>;\n\nexport function shipfoxClientComposition({\n  features,\n  out = './src/shipfox-app.gen.ts',\n}: ShipfoxClientCompositionOptions): Plugin {\n  let config: ResolvedConfig | undefined;\n  let watchedFiles = new Set<string>();\n\n  const outputPath = () => resolve(config?.root ?? process.cwd(), out);\n  const featuresPath = () => resolve(config?.root ?? process.cwd(), features);\n\n  async function assertRoutesResolve(\n    resolveRoute: RouteResolver,\n    routes: ReturnType<typeof composeRoutes>,\n  ): Promise<void> {\n    for (const route of routes) {\n      const resolvedRoute = await resolveRoute(route.impl, outputPath());\n      if (!resolvedRoute) {\n        throw new Error(\n          `Could not resolve route implementation \"${route.impl}\" for \"${route.path}\".`,\n        );\n      }\n    }\n  }\n\n  async function generate({\n    addWatchFile,\n    resolveRoute,\n  }: {\n    addWatchFile(file: string): void;\n    resolveRoute: RouteResolver;\n  }): Promise<void> {\n    const evaluated = await evaluateFeatures(featuresPath());\n    const routes = composeRoutes(evaluated.features);\n    validateProviderIds(evaluated.features);\n    validateNavigation(\n      evaluated.features,\n      routes.map((route) => route.path),\n    );\n    validateSettingsSections(\n      evaluated.features,\n      routes.map((route) => route.path),\n    );\n    mergeConfigShapes(evaluated.features);\n    await assertRoutesResolve(resolveRoute, routes);\n\n    watchedFiles = new Set(evaluated.loadedFiles);\n    for (const file of watchedFiles) addWatchFile(file);\n\n    const output = generateAppModule({\n      routes,\n      navigation: navigationEntries(evaluated.features),\n      settingsSections: settingsEntries(evaluated.features),\n    });\n    const path = outputPath();\n    const existing = await readFile(path, 'utf8').catch(() => undefined);\n    if (existing === output) return;\n    await mkdir(dirname(path), {recursive: true});\n    await writeFile(path, output);\n  }\n\n  return {\n    name: 'shipfox-client-composition',\n    configResolved(resolvedConfig) {\n      config = resolvedConfig;\n    },\n    async buildStart() {\n      await generate({\n        addWatchFile: this.addWatchFile.bind(this),\n        resolveRoute: this.resolve.bind(this),\n      });\n    },\n    async hotUpdate({file, server}) {\n      const resolvedFile = await realpath(file).catch(() => resolve(file));\n      if (!watchedFiles.has(resolvedFile)) return;\n      await generate({\n        addWatchFile: server.watcher.add.bind(server.watcher),\n        resolveRoute: this.environment.pluginContainer.resolveId.bind(\n          this.environment.pluginContainer,\n        ),\n      });\n    },\n  };\n}\n"],"names":["mkdir","readFile","realpath","writeFile","dirname","resolve","composeRoutes","mergeConfigShapes","validateProviderIds","validateNavigation","validateSettingsSections","navigationEntries","settingsEntries","evaluateFeatures","generateAppModule","shipfoxClientComposition","features","out","config","watchedFiles","Set","outputPath","root","process","cwd","featuresPath","assertRoutesResolve","resolveRoute","routes","route","resolvedRoute","impl","Error","path","generate","addWatchFile","evaluated","map","loadedFiles","file","output","navigation","settingsSections","existing","catch","undefined","recursive","name","configResolved","resolvedConfig","buildStart","bind","hotUpdate","server","resolvedFile","has","watcher","add","environment","pluginContainer","resolveId"],"mappings":"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"}
+{"version":3,"sources":["../../src/vite/plugin.ts"],"sourcesContent":["import {mkdir, readFile, realpath, writeFile} from 'node:fs/promises';\nimport {dirname, resolve} from 'node:path';\nimport type {Plugin, ResolvedConfig} from 'vite';\nimport {composeClientFeatures} from '#compose/compose-client-features.js';\nimport {evaluateFeatures} from './evaluate-features.js';\nimport {generateAppModule} from './generate.js';\n\nexport interface ShipfoxClientCompositionOptions {\n  features: string;\n  out?: string;\n}\n\ntype RouteResolver = (source: string, importer?: string) => Promise<{id: string} | null>;\n\nexport function shipfoxClientComposition({\n  features,\n  out = './src/shipfox-app.gen.ts',\n}: ShipfoxClientCompositionOptions): Plugin {\n  let config: ResolvedConfig | undefined;\n  let watchedFiles = new Set<string>();\n\n  const outputPath = () => resolve(config?.root ?? process.cwd(), out);\n  const featuresPath = () => resolve(config?.root ?? process.cwd(), features);\n\n  async function assertRoutesResolve(\n    resolveRoute: RouteResolver,\n    routes: ReturnType<typeof composeClientFeatures>['routes'],\n  ): Promise<void> {\n    for (const route of routes) {\n      const resolvedRoute = await resolveRoute(route.impl, outputPath());\n      if (!resolvedRoute) {\n        throw new Error(\n          `Could not resolve route implementation \"${route.impl}\" for \"${route.path}\".`,\n        );\n      }\n    }\n  }\n\n  async function generate({\n    addWatchFile,\n    resolveRoute,\n  }: {\n    addWatchFile(file: string): void;\n    resolveRoute: RouteResolver;\n  }): Promise<void> {\n    const evaluated = await evaluateFeatures(featuresPath());\n    const composition = composeClientFeatures(evaluated.features);\n    await assertRoutesResolve(resolveRoute, composition.routes);\n\n    watchedFiles = new Set(evaluated.loadedFiles);\n    for (const file of watchedFiles) addWatchFile(file);\n\n    const output = generateAppModule({\n      routes: composition.routes,\n      navigation: composition.navigation,\n      settingsSections: composition.settingsSections,\n    });\n    const path = outputPath();\n    const existing = await readFile(path, 'utf8').catch(() => undefined);\n    if (existing === output) return;\n    await mkdir(dirname(path), {recursive: true});\n    await writeFile(path, output);\n  }\n\n  return {\n    name: 'shipfox-client-composition',\n    configResolved(resolvedConfig) {\n      config = resolvedConfig;\n    },\n    async buildStart() {\n      await generate({\n        addWatchFile: this.addWatchFile.bind(this),\n        resolveRoute: this.resolve.bind(this),\n      });\n    },\n    async hotUpdate({file, server}) {\n      const resolvedFile = await realpath(file).catch(() => resolve(file));\n      if (!watchedFiles.has(resolvedFile)) return;\n      await generate({\n        addWatchFile: server.watcher.add.bind(server.watcher),\n        resolveRoute: this.environment.pluginContainer.resolveId.bind(\n          this.environment.pluginContainer,\n        ),\n      });\n    },\n  };\n}\n"],"names":["mkdir","readFile","realpath","writeFile","dirname","resolve","composeClientFeatures","evaluateFeatures","generateAppModule","shipfoxClientComposition","features","out","config","watchedFiles","Set","outputPath","root","process","cwd","featuresPath","assertRoutesResolve","resolveRoute","routes","route","resolvedRoute","impl","Error","path","generate","addWatchFile","evaluated","composition","loadedFiles","file","output","navigation","settingsSections","existing","catch","undefined","recursive","name","configResolved","resolvedConfig","buildStart","bind","hotUpdate","server","resolvedFile","has","watcher","add","environment","pluginContainer","resolveId"],"mappings":"AAAA,SAAQA,KAAK,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,SAAS,QAAO,mBAAmB;AACtE,SAAQC,OAAO,EAAEC,OAAO,QAAO,YAAY;AAE3C,SAAQC,qBAAqB,QAAO,sCAAsC;AAC1E,SAAQC,gBAAgB,QAAO,yBAAyB;AACxD,SAAQC,iBAAiB,QAAO,gBAAgB;AAShD,OAAO,SAASC,yBAAyB,EACvCC,QAAQ,EACRC,MAAM,0BAA0B,EACA;IAChC,IAAIC;IACJ,IAAIC,eAAe,IAAIC;IAEvB,MAAMC,aAAa,IAAMV,QAAQO,QAAQI,QAAQC,QAAQC,GAAG,IAAIP;IAChE,MAAMQ,eAAe,IAAMd,QAAQO,QAAQI,QAAQC,QAAQC,GAAG,IAAIR;IAElE,eAAeU,oBACbC,YAA2B,EAC3BC,MAA0D;QAE1D,KAAK,MAAMC,SAASD,OAAQ;YAC1B,MAAME,gBAAgB,MAAMH,aAAaE,MAAME,IAAI,EAAEV;YACrD,IAAI,CAACS,eAAe;gBAClB,MAAM,IAAIE,MACR,CAAC,wCAAwC,EAAEH,MAAME,IAAI,CAAC,OAAO,EAAEF,MAAMI,IAAI,CAAC,EAAE,CAAC;YAEjF;QACF;IACF;IAEA,eAAeC,SAAS,EACtBC,YAAY,EACZR,YAAY,EAIb;QACC,MAAMS,YAAY,MAAMvB,iBAAiBY;QACzC,MAAMY,cAAczB,sBAAsBwB,UAAUpB,QAAQ;QAC5D,MAAMU,oBAAoBC,cAAcU,YAAYT,MAAM;QAE1DT,eAAe,IAAIC,IAAIgB,UAAUE,WAAW;QAC5C,KAAK,MAAMC,QAAQpB,aAAcgB,aAAaI;QAE9C,MAAMC,SAAS1B,kBAAkB;YAC/Bc,QAAQS,YAAYT,MAAM;YAC1Ba,YAAYJ,YAAYI,UAAU;YAClCC,kBAAkBL,YAAYK,gBAAgB;QAChD;QACA,MAAMT,OAAOZ;QACb,MAAMsB,WAAW,MAAMpC,SAAS0B,MAAM,QAAQW,KAAK,CAAC,IAAMC;QAC1D,IAAIF,aAAaH,QAAQ;QACzB,MAAMlC,MAAMI,QAAQuB,OAAO;YAACa,WAAW;QAAI;QAC3C,MAAMrC,UAAUwB,MAAMO;IACxB;IAEA,OAAO;QACLO,MAAM;QACNC,gBAAeC,cAAc;YAC3B/B,SAAS+B;QACX;QACA,MAAMC;YACJ,MAAMhB,SAAS;gBACbC,cAAc,IAAI,CAACA,YAAY,CAACgB,IAAI,CAAC,IAAI;gBACzCxB,cAAc,IAAI,CAAChB,OAAO,CAACwC,IAAI,CAAC,IAAI;YACtC;QACF;QACA,MAAMC,WAAU,EAACb,IAAI,EAAEc,MAAM,EAAC;YAC5B,MAAMC,eAAe,MAAM9C,SAAS+B,MAAMK,KAAK,CAAC,IAAMjC,QAAQ4B;YAC9D,IAAI,CAACpB,aAAaoC,GAAG,CAACD,eAAe;YACrC,MAAMpB,SAAS;gBACbC,cAAckB,OAAOG,OAAO,CAACC,GAAG,CAACN,IAAI,CAACE,OAAOG,OAAO;gBACpD7B,cAAc,IAAI,CAAC+B,WAAW,CAACC,eAAe,CAACC,SAAS,CAACT,IAAI,CAC3D,IAAI,CAACO,WAAW,CAACC,eAAe;YAEpC;QACF;IACF;AACF"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/client-shell",
   "license": "MIT",
-  "version": "4.0.0",
+  "version": "6.0.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -14,10 +14,6 @@
     "dist",
     "assets"
   ],
-  "imports": {
-    "#*": "./dist/*",
-    "#test/*": "./test/*"
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -41,12 +37,12 @@
     "@tanstack/router-core": "^1.171.13",
     "tsx": "^4.22.4",
     "framer-motion": "^12.23.24",
-    "@shipfox/api-auth-dto": "7.1.0",
-    "@shipfox/api-workspaces-dto": "6.0.0",
-    "@shipfox/client-api": "4.0.0",
-    "@shipfox/client-config": "3.0.1",
-    "@shipfox/client-ui": "4.0.0",
-    "@shipfox/react-ui": "0.3.5"
+    "@shipfox/api-workspaces-dto": "9.0.1",
+    "@shipfox/client-api": "6.0.1",
+    "@shipfox/client-config": "6.0.1",
+    "@shipfox/react-ui": "0.3.6",
+    "@shipfox/client-ui": "6.0.1",
+    "@shipfox/api-auth-dto": "9.0.1"
   },
   "peerDependencies": {
     "@storybook/react": "^10.4.6",
@@ -63,6 +59,9 @@
       "optional": true
     }
   },
+  "imports": {
+    "#*": "./dist/*"
+  },
   "scripts": {
     "build": "shipfox-swc",
     "check": "shipfox-biome-check",