@ossy/app 1.28.0 → 1.29.0

package/cli/build.task.js

@@ -15,10 +15,11 @@ import getPlatformFiles, {
   TASK_FILE_PATTERN,
   RESOURCE_FILE_PATTERN,
   COMPONENT_FILE_PATTERN,
+  AGGREGATE_FILE_PATTERN,
 } from './get-platform-files.task.js'
 import { manifestPlugin } from './manifest-plugin.js'
 
-export { PAGE_FILE_PATTERN, API_FILE_PATTERN, TASK_FILE_PATTERN, RESOURCE_FILE_PATTERN, COMPONENT_FILE_PATTERN }
+export { PAGE_FILE_PATTERN, API_FILE_PATTERN, TASK_FILE_PATTERN, RESOURCE_FILE_PATTERN, COMPONENT_FILE_PATTERN, AGGREGATE_FILE_PATTERN }
 
 // Generated entry stubs live under `build/.ossy/entries/`. Putting them
 // inside `build/` means they're cleaned automatically with every build,
@@ -143,11 +144,24 @@ function generateComponentStub ({ stubAbs, sourceAbs }) {
   ].join('\n')
 }
 
+// Aggregates are server-side only. The stub re-exports everything so the
+// manifest plugin can read `Aggregate` (the class) and `id` (the AggregateType
+// string) from the bundled output.
+function generateAggregateStub ({ stubAbs, sourceAbs }) {
+  const importPath = relImport(stubAbs, sourceAbs)
+  return [
+    '// Generated by @ossy/app — do not edit',
+    `export * from '${importPath}'`,
+    '',
+  ].join('\n')
+}
+
 function stubFor (kind, args) {
   if (kind === 'page') return generatePageStub(args)
   if (kind === 'api') return generateApiStub(args)
   if (kind === 'resource') return generateResourceStub(args)
   if (kind === 'component') return generateComponentStub(args)
+  if (kind === 'aggregate') return generateAggregateStub(args)
   return generateTaskStub(args)
 }
 
@@ -189,6 +203,7 @@ export async function build (cliArgs = []) {
     ...platformFiles.tasks,
     ...platformFiles.resources,
     ...platformFiles.components,
+    ...platformFiles.aggregates,
   ]
 
   const entriesByStub = new Map()

package/cli/get-platform-files.task.js

@@ -6,9 +6,10 @@ export const API_FILE_PATTERN = /\.api\.(mjs|cjs|js)$/
 export const TASK_FILE_PATTERN = /\.task\.(mjs|cjs|js)$/
 export const RESOURCE_FILE_PATTERN = /\.resource\.(mjs|cjs|js)$/
 export const COMPONENT_FILE_PATTERN = /\.component\.(jsx?|tsx?)$/
+export const AGGREGATE_FILE_PATTERN = /\.aggregate\.(mjs|cjs|js)$/
 
 /**
- * @typedef {'page' | 'api' | 'task' | 'resource' | 'component'} EntryKind
+ * @typedef {'page' | 'api' | 'task' | 'resource' | 'component' | 'aggregate'} EntryKind
  *
  * @typedef {object} PlatformEntry
  * @property {EntryKind} kind          Which bucket this entry lives in.
@@ -22,6 +23,7 @@ export const COMPONENT_FILE_PATTERN = /\.component\.(jsx?|tsx?)$/
  * @property {PlatformEntry[]} tasks       Discovered `*.task.{js,mjs,cjs}` entries.
  * @property {PlatformEntry[]} resources   Discovered `*.resource.{js,mjs,cjs}` entries.
  * @property {PlatformEntry[]} components  Discovered `*.component.{jsx,tsx,...}` entries.
+ * @property {PlatformEntry[]} aggregates  Discovered `*.aggregate.{js,mjs,cjs}` entries (installed packages only).
  */
 export function discoverFilesByPattern (srcDir, filePattern) {
   const dir = path.resolve(srcDir)
@@ -45,6 +47,7 @@ function classifyFile (absPath) {
   if (TASK_FILE_PATTERN.test(base)) return 'task'
   if (RESOURCE_FILE_PATTERN.test(base)) return 'resource'
   if (COMPONENT_FILE_PATTERN.test(base)) return 'component'
+  if (AGGREGATE_FILE_PATTERN.test(base)) return 'aggregate'
   return null
 }
 
@@ -114,6 +117,7 @@ export function discoverInstalledPackageEntries (projectRoot) {
       ...discoverFilesByPattern(packageSrcDir, TASK_FILE_PATTERN),
       ...discoverFilesByPattern(packageSrcDir, RESOURCE_FILE_PATTERN),
       ...discoverFilesByPattern(packageSrcDir, COMPONENT_FILE_PATTERN),
+      ...discoverFilesByPattern(packageSrcDir, AGGREGATE_FILE_PATTERN),
     ]
     for (const sourcePath of files) {
       const stat = fs.statSync(sourcePath)
@@ -157,9 +161,12 @@ export function discoverInstalledPackageEntries (projectRoot) {
  * @returns {Promise<PlatformFiles>}
  */
 export default async function getPlatformFiles (srcDir) {
-  const out = { pages: [], apis: [], tasks: [], resources: [], components: [] }
-  const bucketByKind = { page: 'pages', api: 'apis', task: 'tasks', resource: 'resources', component: 'components' }
+  const out = { pages: [], apis: [], tasks: [], resources: [], components: [], aggregates: [] }
+  const bucketByKind = { page: 'pages', api: 'apis', task: 'tasks', resource: 'resources', component: 'components', aggregate: 'aggregates' }
 
+  // Aggregates are only discovered from installed packages — never from the
+  // local `src/` — to avoid pulling in per-project duplicates of the same
+  // aggregate class that is canonically owned by the feature package.
   const localFiles = [
     ...discoverFilesByPattern(srcDir, PAGE_FILE_PATTERN),
     ...discoverFilesByPattern(srcDir, API_FILE_PATTERN),
@@ -171,7 +178,7 @@ export default async function getPlatformFiles (srcDir) {
     const stat = fs.statSync(sourcePath)
     if (!stat.isFile() || stat.size === 0) continue
     const kind = classifyFile(sourcePath)
-    if (!kind) continue
+    if (!kind || kind === 'aggregate') continue
     out[bucketByKind[kind]].push({ kind, sourcePath })
   }
 

package/cli/manifest-plugin.js

@@ -42,10 +42,15 @@ import { metadataIdFromFile, defaultPageRoute } from './get-platform-files.task.
  * @property {string} id     Unique component id (from `metadata.id`).
  * @property {string} entry  URL the platform serves the component bundle from.
  *
+ * @typedef {object} AggregateManifestEntry
+ * @property {string} id     AggregateType string (e.g. `'User'`).
+ * @property {string} entry  URL the platform serves the aggregate bundle from.
+ *
  * @typedef {object} Manifest
  * @property {ManifestEntry[]} entries          Flat, ordered list of every routable thing.
  * @property {ComponentManifestEntry[]} components  Discovered `*.component.*` entries, keyed by id.
  * @property {object[]} resourceTemplates       Each `*.resource.js` file's default-exported template object.
+ * @property {AggregateManifestEntry[]} aggregates  Discovered `*.aggregate.js` entries from installed packages.
  * @property {object} config                    Inlined `src/config.js` default export.
  */
 
@@ -93,8 +98,11 @@ export function manifestPlugin ({ entriesByStub, srcDir, staticOutDir, configVal
       const resourceTemplates = []
       /** @type {import('./get-platform-files.task.js').ComponentManifestEntry[]} */
       const components = []
+      /** @type {AggregateManifestEntry[]} */
+      const aggregates = []
       const seenIds = { page: new Set(), api: new Set(), task: new Set(), component: new Set() }
       const seenResourceIds = new Set()
+      const seenAggregateIds = new Set()
 
       for (const fileName of Object.keys(bundle)) {
         const chunk = bundle[fileName]
@@ -120,6 +128,30 @@ export function manifestPlugin ({ entriesByStub, srcDir, staticOutDir, configVal
           )
         }
 
+        // Aggregates are server-side classes — the bundle exports `Aggregate`
+        // (the class) and `id` (the AggregateType string). They don't produce
+        // routable entries; they accumulate into a separate `aggregates` array.
+        if (entryInfo.kind === 'aggregate') {
+          const AggregateClass = mod && mod.Aggregate
+          const aggregateId = mod && mod.id
+          if (typeof AggregateClass !== 'function') {
+            this.error(
+              `[@ossy/app][build] aggregate entry ${entryInfo.sourcePath} must export a class as "Aggregate"`,
+            )
+          }
+          if (typeof aggregateId !== 'string' || aggregateId.trim() === '') {
+            this.error(
+              `[@ossy/app][build] aggregate entry ${entryInfo.sourcePath} must export a non-empty string "id"`,
+            )
+          }
+          if (seenAggregateIds.has(aggregateId)) {
+            this.error(`[@ossy/app][build] Duplicate aggregate id "${aggregateId}"`)
+          }
+          seenAggregateIds.add(aggregateId)
+          aggregates.push({ id: aggregateId, entry: url })
+          continue
+        }
+
         // Resources are pure data — the default export *is* the template.
         // They don't use `metadata`, don't need a derived id, and don't
         // produce a routable manifest entry; they accumulate into a separate
@@ -181,7 +213,7 @@ export function manifestPlugin ({ entriesByStub, srcDir, staticOutDir, configVal
       }
 
       /** @type {Manifest} */
-      const manifest = { entries, components, resourceTemplates, config: configValue || {} }
+      const manifest = { entries, components, resourceTemplates, aggregates, config: configValue || {} }
       fs.mkdirSync(path.dirname(manifestPath), { recursive: true })
       fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2), 'utf8')
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "1.28.0",
+  "version": "1.29.0",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -37,15 +37,15 @@
     "@babel/eslint-parser": "^7.15.8",
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
-    "@ossy/connected-components": "^1.28.0",
-    "@ossy/design-system": "^1.28.0",
+    "@ossy/connected-components": "^1.29.0",
+    "@ossy/design-system": "^1.29.0",
     "@ossy/pages": "^1.23.0",
-    "@ossy/platform": "^1.27.0",
-    "@ossy/router": "^1.28.0",
-    "@ossy/router-react": "^1.28.0",
-    "@ossy/sdk": "^1.28.0",
-    "@ossy/sdk-react": "^1.28.0",
-    "@ossy/themes": "^1.28.0",
+    "@ossy/platform": "^1.28.0",
+    "@ossy/router": "^1.29.0",
+    "@ossy/router-react": "^1.29.0",
+    "@ossy/sdk": "^1.29.0",
+    "@ossy/sdk-react": "^1.29.0",
+    "@ossy/themes": "^1.29.0",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-babel": "^7.0.0",
     "@rollup/plugin-commonjs": "^29.0.0",
@@ -79,5 +79,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "5f1feadf3b630aa96ec61f1d48c11e0e1aa4b095"
+  "gitHead": "c71b23b5721bfd12dec0dfb4b50d945b65314898"
 }