@uniweb/build 0.77.0 → 0.78.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@uniweb/build",
3
- "version": "0.77.0",
3
+ "version": "0.78.0",
4
4
  "description": "Build tooling for the Uniweb Component Web Platform",
5
5
  "type": "module",
6
6
  "exports": {
@@ -57,12 +57,12 @@
57
57
  "js-yaml": "^4.1.0",
58
58
  "sharp": "^0.35.3",
59
59
  "yaml": "^2.5.0",
60
+ "@uniweb/projections": "^0.7.14",
61
+ "@uniweb/content-writer": "^0.3.4",
60
62
  "@uniweb/semantic-parser": "^1.5.1",
61
- "@uniweb/theming": "^0.2.0",
62
- "@uniweb/schemas": "^0.12.0",
63
63
  "@uniweb/content-reader": "^1.2.8",
64
- "@uniweb/projections": "^0.7.14",
65
- "@uniweb/content-writer": "^0.3.4"
64
+ "@uniweb/schemas": "^0.12.0",
65
+ "@uniweb/theming": "^0.2.0"
66
66
  },
67
67
  "optionalDependencies": {
68
68
  "@uniweb/runtime": "^0.29.2"
@@ -19,7 +19,6 @@ export { collectSiteContent } from '../site/content-collector.js'
19
19
  export {
20
20
  processQueries,
21
21
  writeQueryFiles,
22
- getQueryLastModified,
23
22
  } from '../site/query-processor.js'
24
23
  // Where a site's records live — `paths.records`, else `records/` — so a caller
25
24
  // holding its own config (a document's, not a `site.yml`) asks the one resolver.
@@ -4,20 +4,35 @@ import { pathToFileURL } from 'node:url'
4
4
  import yaml from 'js-yaml'
5
5
  import { YAML_OPTIONS } from '../utils/yaml-schema.js'
6
6
 
7
+ /**
8
+ * Where `uniweb dev` answers the site's `api` service when `$devApi` names a handler.
9
+ * The dev server is the host here, so the address is its own.
10
+ */
11
+ export const DEV_API_ADDRESS = '/_api'
12
+
7
13
  /**
8
14
  * Mount a site's own request handler in the dev server.
9
15
  *
10
16
  * A site that talks to a backend needs one running to be developed against, and
11
17
  * making that a live deployment is slow, costs money, and puts a shared database
12
- * behind a developer's experiments. So a site may name a **local handler** and the
13
- * dev server mounts it at the site's own service address:
18
+ * behind a developer's experiments. So a site may name a **local handler**, and in
19
+ * `uniweb dev` the dev server answers the site's `api` service with it:
14
20
  *
15
21
  * ```yaml
16
22
  * # site.yml
17
- * api: /_api # where the site's app backend answers
18
- * devApi: ./mock/api.js # what answers it, in development only
23
+ * services:
24
+ * api: true # ask your host for an app backend (in production)
25
+ * $devApi: ./mock/api.js # what answers it in `uniweb dev`, at /_api
19
26
  * ```
20
27
  *
28
+ * ⭐ THE DEV SERVER SUPPLIES THE ADDRESS [Diego, 2026-10-06]. In `uniweb dev` it is
29
+ * the host, so where it answers is its own to choose — `DEV_API_ADDRESS` — and the
30
+ * plugin puts that address in the dev payload's `config.api`, the site tier
31
+ * `resolveService` reads when no host speaks. ⛔ *Until then the site wrote it, as a
32
+ * top-level `api: /_api` "the same in development and in production" — an address
33
+ * that, under `services:`, would read as "the site brings its own backend" and ask the
34
+ * host to turn its own off.*
35
+ *
21
36
  * ```js
22
37
  * // mock/api.js — default-export a fetch handler
23
38
  * export default (request) => new Response('{}', { headers: { 'content-type': 'application/json' } })
@@ -35,10 +50,9 @@ import { YAML_OPTIONS } from '../utils/yaml-schema.js'
35
50
  *
36
51
  * ## ⛔ Development only, and it cannot leak
37
52
  *
38
- * `devApi` is read by the dev plugin and by nothing else: no build reads it, no
39
- * `info` key carries it, and nothing writes it into a payload. A site's *address*
40
- * (`api:`) is authored config and travels; what answers that address locally is a
41
- * fact about one machine.
53
+ * `$devApi` is read by the dev plugin and by nothing else: no build reads it, no
54
+ * `info` key carries it, and only the dev server's payload names its address. What
55
+ * answers the site's `api` service locally is a fact about one machine.
42
56
  *
43
57
  * ⚠️ **Same-origin on purpose.** Mounting inside the dev server means cookies and
44
58
  * `credentials: 'same-origin'` behave as they do in production, where a site's app
@@ -59,7 +73,7 @@ import { YAML_OPTIONS } from '../utils/yaml-schema.js'
59
73
  * @param {import('vite').ViteDevServer} server
60
74
  * @param {object} options
61
75
  * @param {string} options.root - the site directory
62
- * @returns {boolean} whether a handler was mounted
76
+ * @returns {string|null} the address the handler answers on, or null when none was mounted
63
77
  */
64
78
  export function mountDevApi(server, { root }) {
65
79
  // ⛔ Read from the RAW site.yml, never from the collected `config`. `$`-prefixed
@@ -70,18 +84,12 @@ export function mountDevApi(server, { root }) {
70
84
  try {
71
85
  site = yaml.load(readFileSync(join(root, 'site.yml'), 'utf8'), YAML_OPTIONS) || {}
72
86
  } catch {
73
- return false
87
+ return null
74
88
  }
75
89
 
76
90
  const spec = site.$devApi
77
- if (!spec) return false
78
-
79
- const declared = site.api
80
- const mount = typeof declared === 'string' ? declared : declared?.endpoint
81
- if (!mount) {
82
- console.error("[dev-api] `$devApi` needs an `api:` address to answer on — add `api: /_api` to site.yml.")
83
- return false
84
- }
91
+ if (!spec) return null
92
+ const mount = DEV_API_ADDRESS
85
93
 
86
94
  // Loaded once, lazily, and awaited by the middleware. ⚠️ Loud and specific on
87
95
  // failure: a dev API that silently fails to load looks exactly like a backend
@@ -139,5 +147,5 @@ export function mountDevApi(server, { root }) {
139
147
  })
140
148
 
141
149
  console.log(`[dev-api] '${spec}' answering ${prefix}/*`)
142
- return true
150
+ return mount
143
151
  }
@@ -41,6 +41,7 @@ import { resolveDefaultLocale, resolvePublishableLocales, validateLanguageConfig
41
41
  import { authoredRedirectTarget } from '@uniweb/core/resolve-route'
42
42
  import { parseFrontmatter } from '../utils/frontmatter.js'
43
43
  import { parseGrid } from '@uniweb/schemas/grid'
44
+ import { runtimeServicesConfig, refuseRetiredServiceKeys } from '../uwx/services-request.js'
44
45
 
45
46
  // Try to import content-reader, fall back to simplified parser
46
47
  let markdownToProseMirror
@@ -2448,11 +2449,13 @@ async function collectLayouts(layoutDir, siteRoot) {
2448
2449
  * `config.fetch`, desugared by the caller; carried raw it would sit beside
2449
2450
  * `config.queries`, the declarations, and read as one.
2450
2451
  *
2451
- * ⛔ `services` is the owner's REQUEST to their host (`uwx/services-request.js`), and
2452
- * here it would land at `config.services` — the HOST tier, where a present block
2453
- * declines every service it does not name. A request is never an answer, so it never
2454
- * ships. *(Until 2026-10-06 it did, and doubled as an undocumented way to simulate a
2455
- * host's offer locally.)*
2452
+ * ⭐ `services` ships as each service's SITE TIER, `config.<name>`
2453
+ * (`runtimeServicesConfig`), and never whole: at `config.services` it would be the HOST
2454
+ * tier, where a present block declines every service it does not name, and its
2455
+ * request half is not an answer. *(Until 2026-10-06 the whole block shipped there, and
2456
+ * doubled as an undocumented way to simulate a host's offer locally; the site tier was
2457
+ * the top-level `search:` / `submit:` / `assistant:` / `tracking:` / `api:` keys,
2458
+ * refused now.)*
2456
2459
  *
2457
2460
  * ⛔ `$`-prefixed keys were the project's BACKEND-SCOPED state — `$uuid`, `$org`,
2458
2461
  * `$backend`, `$services`, `$secrets` — until they moved to `sync.json` (2026-09-20),
@@ -2470,12 +2473,22 @@ function payloadSiteConfig(siteConfig) {
2470
2473
  const {
2471
2474
  publishLanguages: _publishLanguages,
2472
2475
  query: _query,
2473
- services: _services,
2476
+ services,
2474
2477
  ...runtimeSiteConfig
2475
2478
  } = siteConfig
2476
2479
  for (const key of Object.keys(runtimeSiteConfig)) {
2477
2480
  if (key.startsWith('$')) delete runtimeSiteConfig[key]
2478
2481
  }
2482
+ // ⭐ Each service's SITE TIER, from its entry: `config.<name>` — the switch, an
2483
+ // address the site brings, its options — never the request, and never a credential.
2484
+ const warn = (m) => console.warn(`[site-content] ${m}`)
2485
+ for (const [name, value] of Object.entries(runtimeServicesConfig(services, { warn }))) {
2486
+ if (name in runtimeSiteConfig) {
2487
+ warn(`\`services.${name}\` names a site.yml key that is not a service — ignoring it.`)
2488
+ continue
2489
+ }
2490
+ runtimeSiteConfig[name] = value
2491
+ }
2479
2492
  return runtimeSiteConfig
2480
2493
  }
2481
2494
 
@@ -2489,6 +2502,7 @@ export async function collectSiteContent(sitePath, options = {}) {
2489
2502
 
2490
2503
  // Read site config and raw theme config
2491
2504
  const siteConfig = await readYamlFile(join(sitePath, configFile))
2505
+ refuseRetiredServiceKeys(siteConfig, configFile)
2492
2506
 
2493
2507
  // Queries are declared in TWO files — `site.yml::queries` and `queries.yml`,
2494
2508
  // the latter winning per key — and resolving them is one question with one
@@ -203,6 +203,24 @@ export function refuseUnder(where, context) {
203
203
  walk(where)
204
204
  }
205
205
 
206
+ /**
207
+ * ⛔ `filter:` IS RETIRED (2026-10-06 [Diego]: "it should not be supported. We don't need to keep
208
+ * legacy concepts around") — refused on a query and on a fetch. It was the string predicate
209
+ * (`tags contains featured`) that `where:` replaced. A fetch has not read it since 2026-09-05; a
210
+ * query carried it into `config.queries` and applied it nowhere, so a query that said `filter:`
211
+ * delivered every record with nothing said (measured 2026-10-06).
212
+ *
213
+ * @param {Object|undefined} declaration - a query declaration or a binding
214
+ * @param {string} context - where it sits, for the message
215
+ */
216
+ export function refuseFilter(declaration, context) {
217
+ if (!declaration || typeof declaration !== 'object' || declaration.filter === undefined) return
218
+ throw new Error(
219
+ `[uniweb] ${context}: \`filter:\` is retired. Write the predicate as \`where:\`, a where-object — ` +
220
+ `e.g. \`where: { tags: { contains: featured } }\`.`
221
+ )
222
+ }
223
+
206
224
  /**
207
225
  * ⛔ A `where` OUTSIDE THE LANGUAGE STOPS THE BUILD — a retired operator (`like`,
208
226
  * `nin`), an unknown one, an empty `and` / `or`, a text operator with an empty
@@ -340,6 +358,7 @@ export function refuseBinding(fetch, context, { level = null } = {}) {
340
358
  if (typeof fetch !== 'object' || Array.isArray(fetch)) return
341
359
  refuseRefineAndMisplacedCurrent(fetch, context, level)
342
360
  refuseMerge(fetch, context)
361
+ refuseFilter(fetch, context)
343
362
  refuseSourceKeys(fetch, context)
344
363
  if (fetch.collection === undefined) refuseQueryName(fetch.query, context, { object: true })
345
364
  refuseUnder(fetch.where, context)
package/src/site/index.js CHANGED
@@ -41,8 +41,7 @@ export {
41
41
  } from './advanced-processors.js'
42
42
  export {
43
43
  processQueries,
44
- writeQueryFiles,
45
- getQueryLastModified
44
+ writeQueryFiles
46
45
  } from './query-processor.js'
47
46
  export { collectSchemalessData, collectSchemalessDataAssets, rewriteSchemalessDataAssets } from './schemaless-data.js'
48
47
  export {
@@ -655,6 +655,18 @@ export function siteContentPlugin(options = {}) {
655
655
  }
656
656
 
657
657
  let siteContent = null
658
+ // Where `uniweb dev` answers the site's `api` service with `$devApi`'s handler — set
659
+ // in `configureServer`, so never in a build.
660
+ let devApiAddress = null
661
+ /**
662
+ * The dev payload names `$devApi`'s address as the site's `api` service: the site
663
+ * tier, which `resolveService` reads when no host speaks. A build never gets here
664
+ * with one.
665
+ */
666
+ const withDevApi = (content) => {
667
+ if (devApiAddress && content?.config) content.config.api = devApiAddress
668
+ return content
669
+ }
658
670
  // What each section type declares its data blocks are — read once per collection of the site.
659
671
  let dataModelPromise = null
660
672
  const dataModels = () => (dataModelPromise ||= dataBlockModels(resolvedSitePath).catch(() => NO_DATA_MODELS))
@@ -955,7 +967,7 @@ export function siteContentPlugin(options = {}) {
955
967
  // pages stay in the graph so in-progress drafts remain previewable.
956
968
  // strict on a production build: a mount that contributes no pages is a
957
969
  // warning while you author and a broken deploy once you ship.
958
- siteContent = await collectForBundle(resolvedSitePath, { foundationPath, dropUnpublished: isProduction, base: basePath, strict: isProduction })
970
+ siteContent = withDevApi(await collectForBundle(resolvedSitePath, { foundationPath, dropUnpublished: isProduction, base: basePath, strict: isProduction }))
959
971
  dataModelPromise = null
960
972
  headHtml = await loadHeadHtml()
961
973
  console.log(`[site-content] Collected ${siteContent.pages?.length || 0} pages`)
@@ -998,13 +1010,14 @@ export function siteContentPlugin(options = {}) {
998
1010
  server = devServer
999
1011
 
1000
1012
  // A site's own backend, answered locally in development. `site.yml::$devApi`
1001
- // names a module that default-exports a fetch handler, mounted at the site's
1002
- // own `api:` address so the address is identical in dev and in production.
1013
+ // names a module that default-exports a fetch handler; the dev server mounts it
1014
+ // at an address of its own and names that address in the payload it serves
1015
+ // (`withDevApi`), so the site's `api` service resolves to it.
1003
1016
  // ⚠️ Synchronous on purpose — see mountDevApi. An await here and the
1004
1017
  // middleware lands after Vite's SPA fallback, which answers the API with
1005
1018
  // index.html and says nothing about why.
1006
1019
  try {
1007
- mountDevApi(devServer, { root: resolvedSitePath })
1020
+ devApiAddress = mountDevApi(devServer, { root: resolvedSitePath })
1008
1021
  } catch (err) {
1009
1022
  console.error(`[dev-api] ${err.message}`)
1010
1023
  }
@@ -1025,7 +1038,7 @@ export function siteContentPlugin(options = {}) {
1025
1038
  rebuildQueries = false
1026
1039
  console.log('[site-content] Content changed, rebuilding...')
1027
1040
  try {
1028
- siteContent = await collectForBundle(resolvedSitePath, { foundationPath, base: basePath })
1041
+ siteContent = withDevApi(await collectForBundle(resolvedSitePath, { foundationPath, base: basePath }))
1029
1042
  dataModelPromise = null
1030
1043
  headHtml = await loadHeadHtml()
1031
1044
  if (materialize) {
@@ -37,7 +37,7 @@ import { readRegisteredFoundation } from './registered-foundation.js'
37
37
  import { buildDataSchemaMap, SCHEMA_NOT_FOUND } from '../resolve-data-schema.js'
38
38
  import { resolveFoundationSrcPath } from '../utils/foundation-source-root.js'
39
39
  import { buildSchema } from '../schema.js'
40
- import { refuseQueryRoute, refuseLimit } from './data-fetcher.js'
40
+ import { refuseQueryRoute, refuseLimit, refuseFilter } from './data-fetcher.js'
41
41
  import { readFile } from 'node:fs/promises'
42
42
  import yaml from 'js-yaml'
43
43
  import { YAML_OPTIONS } from '../utils/yaml-schema.js'
@@ -248,6 +248,7 @@ export function refuseQueryDeclaration(decl) {
248
248
  }
249
249
  refuseQueryRoute(decl, where)
250
250
  refuseLimit(decl.limit, where)
251
+ refuseFilter(decl, where)
251
252
  // ⛔ `sync:` IS RETIRED (2026-09-21). `sync: false` kept a query's records off a
252
253
  // backend while a query owned its records; every record in `records/` is pushed
253
254
  // now, whatever reads it, so an ignored `sync: false` would push exactly what the
@@ -51,7 +51,7 @@
51
51
  * await writeQueryFiles(siteDir, byQuery)
52
52
  */
53
53
 
54
- import { readFile, readdir, stat, writeFile, mkdir, copyFile, rm } from 'node:fs/promises'
54
+ import { readFile, readdir, writeFile, mkdir, copyFile, rm } from 'node:fs/promises'
55
55
  import { join, basename, extname, dirname, relative, resolve, sep, isAbsolute } from 'node:path'
56
56
  import { existsSync } from 'node:fs'
57
57
  import { createHash } from 'node:crypto'
@@ -59,7 +59,7 @@ import yaml from 'js-yaml'
59
59
  import { YAML_OPTIONS } from '../utils/yaml-schema.js'
60
60
  import { parseBibtex } from '@citestyle/bibtex'
61
61
  import { DATA_DIR, withoutRouteVariables, mapQueryPaths, BRANCH_KEY } from '@uniweb/core'
62
- import { applyWhere, applySort, refuseUnder, refuseOutsideLanguage, refuseQueryRoute, refuseLimit } from './data-fetcher.js'
62
+ import { applyWhere, applySort, refuseUnder, refuseOutsideLanguage, refuseQueryRoute, refuseLimit, refuseFilter } from './data-fetcher.js'
63
63
  import { resolveAssetPath, walkContentAssets, isLocalAssetPath } from './assets.js'
64
64
  import { readEntityPool, groupPoolBySchema, poolDirsForSchema } from './entity-pool.js'
65
65
  import { readRecordsConfig, resolveFolder, folderTreeOrder } from './records-config.js'
@@ -126,7 +126,6 @@ function parseQueryConfig(name, config) {
126
126
  scope: null,
127
127
  sort: null,
128
128
  where: null,
129
- filter: null,
130
129
  limit: 0,
131
130
  excerpt: { maxLength: 160 },
132
131
  }
@@ -136,6 +135,7 @@ function parseQueryConfig(name, config) {
136
135
  refuseOutsideLanguage(config.where, `queries.${name}`)
137
136
  refuseQueryRoute(config, `queries.${name}`)
138
137
  refuseLimit(config.limit, `queries.${name}`)
138
+ refuseFilter(config, `queries.${name}`)
139
139
  return {
140
140
  name,
141
141
  // The query's schema selects its records — `records/{schema}/` declares the
@@ -146,11 +146,8 @@ function parseQueryConfig(name, config) {
146
146
  // here until 2026-09-11: a named query's `scope` was ignored on this lane.
147
147
  scope: typeof config.scope === 'string' ? config.scope : null,
148
148
  sort: config.sort || null,
149
- // `where:` is the CANONICAL predicate; `filter:` is the deprecated string DSL
150
- // it replaced. Both are carried and both are applied below, in the same order
151
- // `data-fetcher.js::applyPostProcessing` uses — see the note there.
149
+ // The predicate. ⛔ `filter:`, the string DSL it replaced, is refused above.
152
150
  where: config.where || null,
153
- filter: config.filter || null,
154
151
  limit: config.limit || 0,
155
152
  excerpt: {
156
153
  maxLength: config.excerpt?.maxLength || 160,
@@ -1419,36 +1416,3 @@ export async function writeQueryFiles(siteDir, byQuery, queriesConfig = null) {
1419
1416
  }
1420
1417
  }
1421
1418
  }
1422
-
1423
- /**
1424
- * Get last modified time for a collection
1425
- *
1426
- * @param {string} siteDir - Site root directory
1427
- * @param {Object} config - Collection config
1428
- * @returns {Promise<Date|null>} Most recent modification time
1429
- */
1430
- export async function getQueryLastModified(siteDir, config) {
1431
- const parsed = parseQueryConfig('temp', config)
1432
- const poolDir = join(siteDir, parsed.path)
1433
-
1434
- if (!existsSync(poolDir)) {
1435
- return null
1436
- }
1437
-
1438
- const files = await readdir(poolDir)
1439
- const itemFiles = files.filter(f =>
1440
- !f.startsWith('_') &&
1441
- (f.endsWith('.md') || f.endsWith('.yml') || f.endsWith('.yaml') || f.endsWith('.json') || f.endsWith('.bib'))
1442
- )
1443
-
1444
- let lastModified = null
1445
-
1446
- for (const file of itemFiles) {
1447
- const fileStat = await stat(join(poolDir, file))
1448
- if (!lastModified || fileStat.mtime > lastModified) {
1449
- lastModified = fileStat.mtime
1450
- }
1451
- }
1452
-
1453
- return lastModified
1454
- }
@@ -45,9 +45,6 @@
45
45
  "agents": [
46
46
  "site.yml::agents"
47
47
  ],
48
- "assistant": [
49
- "site.yml::assistant"
50
- ],
51
48
  "base": [
52
49
  "site.yml::base"
53
50
  ],
@@ -89,19 +86,10 @@
89
86
  "publish_languages": [
90
87
  "site.yml::publishLanguages"
91
88
  ],
92
- "search": [
93
- "site.yml::search"
94
- ],
95
89
  "seo": [
96
90
  "site.yml::seo"
97
91
  ],
98
- "submit": [
99
- "site.yml::submit"
100
- ],
101
- "theme": null,
102
- "tracking": [
103
- "site.yml::tracking"
104
- ]
92
+ "theme": null
105
93
  }
106
94
  },
107
95
  "services": {
package/src/uwx/index.js CHANGED
@@ -12,6 +12,8 @@
12
12
 
13
13
  export { mintUuidV7 } from './uuid.js'
14
14
  export { createZip, readZip } from './zip.js'
15
+ // The queries whose records a site's pages show live — what `records` is for.
16
+ export { recordQueriesShown } from './shown-records.js'
15
17
  export {
16
18
  sha256Hex,
17
19
  toJsonBuffer,
@@ -116,11 +118,12 @@ export {
116
118
  // A site's services request — `site.yml::services`, applied over the site's own rows.
117
119
  // Spec: kb/framework/reference/site-services-request.md
118
120
  export {
121
+ RUNTIME_KEYS,
119
122
  readServicesRequest,
120
- takeServices,
121
- mergeServiceRows,
122
- reconcileServices,
123
- recordAfter,
123
+ statedServices,
124
+ heldServices,
125
+ servicesFromDocument,
126
+ sameServiceRow,
124
127
  } from './services-request.js'
125
128
  export {
126
129
  diffSiteUnits,
@@ -130,6 +133,7 @@ export {
130
133
  walkSiteUnits,
131
134
  collectUnitUuids,
132
135
  collectQueryUuids,
136
+ siteItemsByKey,
133
137
  stampUnitUuids,
134
138
  } from './site-diff.js'
135
139
  export {