@crombolo/schema 0.42.1 → 0.44.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/NOTICE CHANGED
@@ -27,6 +27,15 @@ The Umbraco backoffice
27
27
  @umbraco-cms/backoffice 18.2.0 — MIT — https://github.com/umbraco/Umbraco-CMS
28
28
  @umbraco-ui/uui 2.0.2 — MIT — https://github.com/umbraco/Umbraco.UI
29
29
 
30
+ The Lato fonts
31
+ -------------
32
+ LatoLatin-*.woff2 — Copyright (c) 2011-2015 by tyPoland Lukasz Dziedzic, with
33
+ Reserved Font Name "Lato" — SIL Open Font License 1.1 — https://www.latofonts.com
34
+ Shipped unmodified, as @umbraco-ui/uui ships them, in @crombolo/backoffice-dist
35
+ under `dist/assets/fonts/`, with the licence beside them as `OFL.txt`
36
+ (`packages/backoffice-dist/licenses/Lato-OFL.txt` in this repository). The
37
+ fonts carry the same notice in their own metadata.
38
+
30
39
  Static files from the Umbraco client source tree
31
40
  ------------------------------------------------
32
41
  css/umb-css.css, css/rte-content.css, css/umbraco-blockgridlayout.css
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@crombolo/schema",
3
- "version": "0.42.1",
3
+ "version": "0.44.0",
4
4
  "description": "Internal to crombolo, with no compatibility promise: use @crombolo/crombolo. Schema-as-code for crombolo: TOML document, media and member type definitions.",
5
5
  "license": "MIT",
6
6
  "author": "Crombolo",
@@ -28,7 +28,7 @@
28
28
  "access": "public"
29
29
  },
30
30
  "dependencies": {
31
- "@crombolo/core": "0.42.1",
32
- "@crombolo/data": "0.42.1"
31
+ "@crombolo/core": "0.44.0",
32
+ "@crombolo/data": "0.44.0"
33
33
  }
34
34
  }
package/src/check.ts CHANGED
@@ -257,6 +257,8 @@ export async function runCheck(
257
257
  .innerJoin('node as n', 'n.id', 'ct.node_id')
258
258
  .select(['n.unique_id', 'ct.alias'])
259
259
  .where('ct.retired_at', 'is', null)
260
+ // Made from a form (story 239), kept in step with the forms rather than files.
261
+ .where('ct.form_key', 'is', null)
260
262
  .where('n.node_object_type', '=', repo.objectType)
261
263
  .execute()
262
264
  for (const row of dbTypes) {
package/src/export.ts CHANGED
@@ -226,6 +226,8 @@ export async function exportSchemaSet(db: Db, version: string): Promise<SchemaSe
226
226
  .innerJoin('node as n', 'n.id', 'ct.node_id')
227
227
  .select('n.unique_id')
228
228
  .where('ct.retired_at', 'is', null)
229
+ // Made from a form (story 239): its form's file is its definition.
230
+ .where('ct.form_key', 'is', null)
229
231
  .where('n.node_object_type', '=', repo.objectType)
230
232
  .orderBy('ct.alias')
231
233
  .execute()
package/src/sync.ts CHANGED
@@ -643,13 +643,15 @@ export async function syncSchema(
643
643
  const dbTypes = await tx.q
644
644
  .selectFrom('content_type as ct')
645
645
  .innerJoin('node as n', 'n.id', 'ct.node_id')
646
- .select(['n.unique_id', 'ct.alias'])
646
+ .select(['n.unique_id', 'ct.alias', 'ct.form_key'])
647
647
  .where('ct.retired_at', 'is', null)
648
648
  .where('n.node_object_type', '=', kind.repo.objectType)
649
649
  .execute()
650
650
  for (const row of dbTypes) {
651
651
  const key = String(row.unique_id).toLowerCase()
652
652
  if (inFiles.has(key)) continue
653
+ // Made from a form (story 239), and kept in step with the forms instead.
654
+ if (row.form_key !== null) continue
653
655
  // Shipped with the framework: present whether or not a file defines it.
654
656
  if (SYSTEM_MEDIA_TYPES.some((t) => t.key === key)) continue
655
657
  if (key === SYSTEM_MEMBER_TYPE.key) continue
@@ -25,6 +25,8 @@ export interface SchemaUserGroup {
25
25
  languages: string[] | 'all'
26
26
  }
27
27
 
28
+ /** The section Bundles had, now part of Settings. */
29
+ const RETIRED_SECTION = 'packages'
28
30
  const KEYS = ['alias', 'name', 'description', 'icon', 'sections', 'permissions', 'languages']
29
31
 
30
32
  export function parseUserGroup(file: string, source: string): ParseResult<SchemaUserGroup> {
@@ -45,7 +47,9 @@ export function parseUserGroup(file: string, source: string): ParseResult<Schema
45
47
  `${path}.alias`,
46
48
  'the administrators group is built in, and a file cannot redefine it',
47
49
  )
48
- const sections = r.strs(t, 'sections', path)
50
+ // `packages` named Bundles before it moved into Settings (story 238): read,
51
+ // and dropped, so a file written before still loads.
52
+ const sections = r.strs(t, 'sections', path).filter((section) => section !== RETIRED_SECTION)
49
53
  for (const section of sections)
50
54
  if (!(section in SECTION_ALIASES) && !isExtensionSectionAlias(section))
51
55
  r.problem(