@nuasite/cms-core 0.70.1 → 0.70.3
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/dist/check-entries.d.ts +2 -0
- package/dist/check-entries.d.ts.map +1 -1
- package/dist/check-entries.js +3 -1
- package/dist/check.d.ts.map +1 -1
- package/dist/check.js +30 -11
- package/dist/collection-scanner.d.ts +20 -1
- package/dist/collection-scanner.d.ts.map +1 -1
- package/dist/collection-scanner.js +40 -17
- package/dist/content-config-ast.d.ts +16 -5
- package/dist/content-config-ast.d.ts.map +1 -1
- package/dist/content-config-ast.js +31 -13
- package/dist/core.d.ts.map +1 -1
- package/dist/core.js +3 -1
- package/dist/portable.d.ts +2 -2
- package/dist/portable.d.ts.map +1 -1
- package/dist/portable.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/check-entries.ts +4 -1
- package/src/check.ts +31 -10
- package/src/collection-scanner.ts +69 -16
- package/src/content-config-ast.ts +38 -16
- package/src/core.ts +4 -2
- package/src/portable.ts +2 -1
package/dist/check-entries.d.ts
CHANGED
|
@@ -35,6 +35,8 @@ export declare const normalizeBase: (base: string) => string;
|
|
|
35
35
|
/** The id Astro's `glob()` loader derives from a file, and therefore what a `reference()` must hold. */
|
|
36
36
|
export declare const entryStem: (file: string) => string;
|
|
37
37
|
export declare function isPlainObject(value: unknown): value is Record<string, unknown>;
|
|
38
|
+
/** The entry files a collection's loader reads when its config names no pattern. */
|
|
39
|
+
export declare const DEFAULT_ENTRY_PATTERN = "**/*.{md,mdx,json,yaml,yml}";
|
|
38
40
|
export declare function parseEntry(file: string, raw: string): {
|
|
39
41
|
frontmatter: Record<string, unknown>;
|
|
40
42
|
} | {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-entries.d.ts","sourceRoot":"","sources":["../src/check-entries.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAE7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAElD,MAAM,WAAW,WAAW;IAC3B,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,0GAA0G;IAC1G,IAAI,EAAE,MAAM,CAAA;IACZ,gEAAgE;IAChE,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,yEAAyE;IACzE,UAAU,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,gEAAgE;IAChE,MAAM,EAAE,OAAO,CAAA;IACf,oHAAoH;IACpH,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,WAAW,EAAE,CAAA;CACtB;AAED,MAAM,MAAM,iBAAiB,GAAG,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;AAI7D,iFAAiF;AACjF,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG,MAAuE,CAAA;AAEpH,wGAAwG;AACxG,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,KAAG,MAAmE,CAAA;AAE5G,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAE9E;
|
|
1
|
+
{"version":3,"file":"check-entries.d.ts","sourceRoot":"","sources":["../src/check-entries.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAE7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAElD,MAAM,WAAW,WAAW;IAC3B,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,0GAA0G;IAC1G,IAAI,EAAE,MAAM,CAAA;IACZ,gEAAgE;IAChE,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,yEAAyE;IACzE,UAAU,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,gEAAgE;IAChE,MAAM,EAAE,OAAO,CAAA;IACf,oHAAoH;IACpH,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,WAAW,EAAE,CAAA;CACtB;AAED,MAAM,MAAM,iBAAiB,GAAG,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;AAI7D,iFAAiF;AACjF,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG,MAAuE,CAAA;AAEpH,wGAAwG;AACxG,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,KAAG,MAAmE,CAAA;AAE5G,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAE9E;AAED,oFAAoF;AACpF,eAAO,MAAM,qBAAqB,gCAAgC,CAAA;AAQlE,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAwBlH;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,cAAc,CAI9G;AAED,+FAA+F;AAC/F,wBAAsB,eAAe,CAAC,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAqCzG"}
|
package/dist/check-entries.js
CHANGED
|
@@ -17,8 +17,10 @@ export const entryStem = (file) => path.basename(file).replace(/\.(md|mdx|json|y
|
|
|
17
17
|
export function isPlainObject(value) {
|
|
18
18
|
return typeof value === 'object' && value !== null && !Array.isArray(value) && !(value instanceof Date);
|
|
19
19
|
}
|
|
20
|
+
/** The entry files a collection's loader reads when its config names no pattern. */
|
|
21
|
+
export const DEFAULT_ENTRY_PATTERN = '**/*.{md,mdx,json,yaml,yml}';
|
|
20
22
|
async function collectEntryFiles(fs, collection, base) {
|
|
21
|
-
const pattern = collection.loaderPattern ??
|
|
23
|
+
const pattern = collection.loaderPattern ?? DEFAULT_ENTRY_PATTERN;
|
|
22
24
|
const files = await fs.glob(`${base}/${pattern}`);
|
|
23
25
|
return files.filter(file => !path.basename(file).startsWith('_')).sort();
|
|
24
26
|
}
|
package/dist/check.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../src/check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;
|
|
1
|
+
{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../src/check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAgBH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAE,KAAK,WAAW,EAAa,MAAM,kBAAkB,CAAA;AAG9D,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,SAAS,CAAA;AAE/C,MAAM,WAAW,YAAY;IAC5B,QAAQ,EAAE,aAAa,CAAA;IACvB,mFAAmF;IACnF,IAAI,EAAE,MAAM,CAAA;IACZ,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAA;IACZ,6EAA6E;IAC7E,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,WAAW;IAC3B,QAAQ,EAAE,YAAY,EAAE,CAAA;IACxB,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;CACf;AA8KD,MAAM,WAAW,mBAAmB;IACnC;;;;OAIG;IACH,OAAO,CAAC,EAAE,WAAW,CAAA;CACrB;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,WAAW,CAAC,CAuK7G;AAED,sEAAsE;AACtE,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CA0B7D"}
|
package/dist/check.js
CHANGED
|
@@ -12,11 +12,11 @@
|
|
|
12
12
|
* `astro sync` already provides.
|
|
13
13
|
*/
|
|
14
14
|
import { assetBaseDir, resolveAssetCandidates } from "./asset-paths.js";
|
|
15
|
-
import { isPlainObject, loadCollections } from "./check-entries.js";
|
|
15
|
+
import { DEFAULT_ENTRY_PATTERN, isPlainObject, loadCollections } from "./check-entries.js";
|
|
16
16
|
import { checkAgainstSchemas } from "./check-live.js";
|
|
17
17
|
import { checkFieldShapes } from "./check-shape.js";
|
|
18
18
|
import { checkEditorWrites } from "./check-write.js";
|
|
19
|
-
import { classifyEmptyContentConfig, CONTENT_CONFIG_PATHS, parseContentConfig, } from "./content-config-ast.js";
|
|
19
|
+
import { classifyEmptyContentConfig, CONTENT_CONFIG_PATHS, findLoadedContentConfig, isReadContentConfig, parseContentConfig, } from "./content-config-ast.js";
|
|
20
20
|
import { schemaFor } from "./schema-port.js";
|
|
21
21
|
import { computePathnameFromSpec } from "./shared.js";
|
|
22
22
|
const typeName = (value) => {
|
|
@@ -176,6 +176,19 @@ function pathnameCollisions(collection, entries) {
|
|
|
176
176
|
}
|
|
177
177
|
return findings;
|
|
178
178
|
}
|
|
179
|
+
function unreadConfigFinding(file) {
|
|
180
|
+
const reads = `the check does not read it (it reads ${CONTENT_CONFIG_PATHS.join(' or ')}), so none of the collections or entries were checked`;
|
|
181
|
+
const message = file.startsWith('src/content/')
|
|
182
|
+
? `Astro loads the content collections from this legacy file only when its config sets \`legacy.collectionsBackwardsCompat\`, and fails the build otherwise; ${reads}.`
|
|
183
|
+
: `Astro loads the content collections from this file; ${reads}.`;
|
|
184
|
+
return {
|
|
185
|
+
severity: 'warning',
|
|
186
|
+
code: 'config/unread',
|
|
187
|
+
file,
|
|
188
|
+
message,
|
|
189
|
+
hint: 'Move the collections into src/content.config.ts and delete this file to have them checked.',
|
|
190
|
+
};
|
|
191
|
+
}
|
|
179
192
|
/**
|
|
180
193
|
* Validate every declared collection against what is on disk.
|
|
181
194
|
*
|
|
@@ -184,20 +197,26 @@ function pathnameCollisions(collection, entries) {
|
|
|
184
197
|
*/
|
|
185
198
|
export async function checkContent(fs, options = {}) {
|
|
186
199
|
const findings = [];
|
|
200
|
+
// The collections the build loads are the ones in the file Astro picks. When the reader does not read that file,
|
|
201
|
+
// a `.ts` config beside it is ignored by the build, so checking it would judge the site by the wrong schemas.
|
|
202
|
+
const loaded = await findLoadedContentConfig(fs);
|
|
203
|
+
if (loaded !== null && !isReadContentConfig(loaded)) {
|
|
204
|
+
return { findings: [unreadConfigFinding(loaded)], collections: 0, entries: 0 };
|
|
205
|
+
}
|
|
187
206
|
const config = await parseContentConfig(fs, new Map());
|
|
188
207
|
if (config.size === 0) {
|
|
189
|
-
//
|
|
190
|
-
//
|
|
191
|
-
// blocked the publish of every such site and sent the agent chasing a defect that was not there.
|
|
208
|
+
// The build loads no collection without a declaring config, so a site without one builds: by this
|
|
209
|
+
// function's contract that is no error. Entries left under src/content then render nothing — a warning.
|
|
192
210
|
const reason = await classifyEmptyContentConfig(fs);
|
|
193
|
-
if (reason
|
|
211
|
+
if (reason === 'unparseable') {
|
|
212
|
+
findings.push({ severity: 'error', code: 'config/unreadable', file: 'src/content.config.ts', message: 'The content config could not be parsed.' });
|
|
213
|
+
}
|
|
214
|
+
else if (reason === 'missing' && (await fs.glob(`src/content/${DEFAULT_ENTRY_PATTERN}`)).length > 0) {
|
|
194
215
|
findings.push({
|
|
195
|
-
severity: '
|
|
196
|
-
code:
|
|
216
|
+
severity: 'warning',
|
|
217
|
+
code: 'config/missing',
|
|
197
218
|
file: 'src/content.config.ts',
|
|
198
|
-
message:
|
|
199
|
-
? `No content config found — expected one of ${CONTENT_CONFIG_PATHS.join(' or ')}.`
|
|
200
|
-
: 'The content config could not be parsed.',
|
|
219
|
+
message: `No content config found — expected one of ${CONTENT_CONFIG_PATHS.join(' or ')}. The build loads none of the entries under src/content.`,
|
|
201
220
|
});
|
|
202
221
|
}
|
|
203
222
|
return { findings, collections: 0, entries: 0 };
|
|
@@ -1,6 +1,23 @@
|
|
|
1
1
|
import type { CollectionDefinition, CollectionScanReport } from '@nuasite/cms-types';
|
|
2
2
|
import { type ParseCache } from './content-config-ast.ts';
|
|
3
3
|
import type { CmsFileSystem } from './fs/types.ts';
|
|
4
|
+
/** `@position`/`@group` comment directives of one entry's frontmatter, by field name. */
|
|
5
|
+
export type FieldDirectives = Record<string, {
|
|
6
|
+
position?: 'sidebar' | 'header';
|
|
7
|
+
group?: string;
|
|
8
|
+
}>;
|
|
9
|
+
/** One entry's frontmatter block and what the scan parses out of it. */
|
|
10
|
+
export interface ParsedFrontmatter {
|
|
11
|
+
block: string;
|
|
12
|
+
data: Record<string, unknown> | null;
|
|
13
|
+
directives: FieldDirectives;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Parsed frontmatter of each markdown entry, by root-relative file path. A scan reuses an entry's
|
|
17
|
+
* parse while its frontmatter block is unchanged and drops the paths it no longer finds, so the
|
|
18
|
+
* memo never outlives the files it describes.
|
|
19
|
+
*/
|
|
20
|
+
export type FrontmatterCache = Map<string, ParsedFrontmatter>;
|
|
4
21
|
/**
|
|
5
22
|
* Normalize a glob loader `base` (`./src/content/x`, `src/content/x/`) into a
|
|
6
23
|
* root-relative path comparable with a collection definition's `path`. The project
|
|
@@ -13,10 +30,12 @@ export declare function normalizeBasePath(basePath: string): string;
|
|
|
13
30
|
*
|
|
14
31
|
* `contentDir` is a root-relative directory (default `src/content`); all I/O is
|
|
15
32
|
* resolved against the injected `CmsFileSystem`'s root. `parseCache` keeps the
|
|
16
|
-
* mtime-keyed content-config parse result across calls within one core instance
|
|
33
|
+
* mtime-keyed content-config parse result across calls within one core instance, and
|
|
34
|
+
* `options.frontmatterCache` each entry's parsed frontmatter (see {@link FrontmatterCache}).
|
|
17
35
|
*/
|
|
18
36
|
export declare function scanCollections(fs: CmsFileSystem, contentDir?: string, parseCache?: ParseCache, options?: {
|
|
19
37
|
report?: boolean;
|
|
38
|
+
frontmatterCache?: FrontmatterCache;
|
|
20
39
|
}): Promise<Record<string, CollectionDefinition>>;
|
|
21
40
|
/**
|
|
22
41
|
* What the scan that returned `collections` could not vouch for.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection-scanner.d.ts","sourceRoot":"","sources":["../src/collection-scanner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,oBAAoB,EAEpB,oBAAoB,EAIpB,MAAM,oBAAoB,CAAA;AAG3B,OAAO,EAMN,KAAK,UAAU,EAKf,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAAE,aAAa,EAAe,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"collection-scanner.d.ts","sourceRoot":"","sources":["../src/collection-scanner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,oBAAoB,EAEpB,oBAAoB,EAIpB,MAAM,oBAAoB,CAAA;AAG3B,OAAO,EAMN,KAAK,UAAU,EAKf,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAAE,aAAa,EAAe,MAAM,eAAe,CAAA;AAgH/D,yFAAyF;AACzF,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,QAAQ,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAEjG,wEAAwE;AACxE,MAAM,WAAW,iBAAiB;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;IACpC,UAAU,EAAE,eAAe,CAAA;CAC3B;AAED;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;AA2+B7D;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE1D;AAqCD;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACpC,EAAE,EAAE,aAAa,EACjB,UAAU,GAAE,MAAsB,EAClC,UAAU,GAAE,UAAsB,EAClC,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;CAAO,GACrE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAsH/C;AAKD;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,GAAG,oBAAoB,GAAG,SAAS,CAExH"}
|
|
@@ -89,19 +89,38 @@ function extractFrontmatterBlock(content) {
|
|
|
89
89
|
const match = content.match(FRONTMATTER_PATTERN);
|
|
90
90
|
return match?.[1] ?? null;
|
|
91
91
|
}
|
|
92
|
-
function parseFrontmatter(content) {
|
|
92
|
+
function parseFrontmatter(content, filePath, memo) {
|
|
93
93
|
const block = extractFrontmatterBlock(content);
|
|
94
94
|
if (!block)
|
|
95
95
|
return null;
|
|
96
|
-
|
|
96
|
+
memo?.seen.add(filePath);
|
|
97
|
+
const cached = memo?.cache.get(filePath);
|
|
98
|
+
// `data` is copied out of the memo, so a scan's caller can mutate its entries without changing
|
|
99
|
+
// the next scan's; directives never leave the scanner.
|
|
100
|
+
if (cached?.block === block)
|
|
101
|
+
return { ...cached, data: structuredClone(cached.data) };
|
|
102
|
+
const parsed = {
|
|
103
|
+
block,
|
|
104
|
+
data: parseYaml(block),
|
|
105
|
+
directives: parseFieldDirectives(block),
|
|
106
|
+
};
|
|
107
|
+
if (!memo)
|
|
108
|
+
return parsed;
|
|
109
|
+
memo.cache.set(filePath, parsed);
|
|
110
|
+
return { ...parsed, data: structuredClone(parsed.data) };
|
|
111
|
+
}
|
|
112
|
+
function sweepFrontmatterMemo(memo) {
|
|
113
|
+
for (const filePath of memo.cache.keys()) {
|
|
114
|
+
if (!memo.seen.has(filePath))
|
|
115
|
+
memo.cache.delete(filePath);
|
|
116
|
+
}
|
|
97
117
|
}
|
|
98
118
|
/**
|
|
99
|
-
* Parse @position and @group comment directives from raw YAML frontmatter.
|
|
119
|
+
* Parse @position and @group comment directives from a raw YAML frontmatter block.
|
|
100
120
|
* Uses the YAML AST which preserves comments via `commentBefore` on nodes.
|
|
101
121
|
*/
|
|
102
|
-
function parseFieldDirectives(
|
|
103
|
-
|
|
104
|
-
if (!block || !DIRECTIVE_TEXT.test(block))
|
|
122
|
+
function parseFieldDirectives(block) {
|
|
123
|
+
if (!DIRECTIVE_TEXT.test(block))
|
|
105
124
|
return {};
|
|
106
125
|
const doc = parseDocument(block);
|
|
107
126
|
if (!isMap(doc.contents))
|
|
@@ -347,7 +366,7 @@ function getCollectionSourceBasePath(basePath, collectionName, contentDir) {
|
|
|
347
366
|
}
|
|
348
367
|
return normalizedBasePath;
|
|
349
368
|
}
|
|
350
|
-
async function buildCollectionDefinition(fs, basePath, sources, collectionName, contentDir) {
|
|
369
|
+
async function buildCollectionDefinition(fs, basePath, sources, collectionName, contentDir, frontmatterMemo) {
|
|
351
370
|
if (sources.length === 0)
|
|
352
371
|
return null;
|
|
353
372
|
const sourceBasePath = getCollectionSourceBasePath(basePath, collectionName, contentDir);
|
|
@@ -366,9 +385,9 @@ async function buildCollectionDefinition(fs, basePath, sources, collectionName,
|
|
|
366
385
|
const content = fileContents[i];
|
|
367
386
|
if (content === null)
|
|
368
387
|
continue;
|
|
369
|
-
const
|
|
370
|
-
const
|
|
371
|
-
for (const [key, value] of Object.entries(directives)) {
|
|
388
|
+
const parsed = parseFrontmatter(content, path.join(basePath, source.relPath), frontmatterMemo);
|
|
389
|
+
const frontmatter = parsed?.data ?? null;
|
|
390
|
+
for (const [key, value] of Object.entries(parsed?.directives ?? {})) {
|
|
372
391
|
if (!allDirectives[key]) {
|
|
373
392
|
allDirectives[key] = value;
|
|
374
393
|
}
|
|
@@ -459,7 +478,7 @@ async function buildDataCollectionDefinition(fs, basePath, sources, collectionNa
|
|
|
459
478
|
/**
|
|
460
479
|
* Scan a single collection directory and infer its schema
|
|
461
480
|
*/
|
|
462
|
-
async function scanCollection(fs, collectionPath, collectionName, contentDir) {
|
|
481
|
+
async function scanCollection(fs, collectionPath, collectionName, contentDir, frontmatterMemo) {
|
|
463
482
|
const dirEntries = await fs.list(collectionPath);
|
|
464
483
|
if (dirEntries.length === 0)
|
|
465
484
|
return null;
|
|
@@ -493,7 +512,7 @@ async function scanCollection(fs, collectionPath, collectionName, contentDir) {
|
|
|
493
512
|
}
|
|
494
513
|
if (sources.length === 0)
|
|
495
514
|
return null;
|
|
496
|
-
return await buildCollectionDefinition(fs, collectionPath, sources, collectionName, contentDir);
|
|
515
|
+
return await buildCollectionDefinition(fs, collectionPath, sources, collectionName, contentDir, frontmatterMemo);
|
|
497
516
|
}
|
|
498
517
|
/**
|
|
499
518
|
* The files a glob loader matches, relative to its base. The scan leaves symbolic links out;
|
|
@@ -516,7 +535,7 @@ async function globLoaderFiles(fs, baseRel, pattern, options) {
|
|
|
516
535
|
* Scan a collection declared in content config via a glob loader (base + pattern),
|
|
517
536
|
* which may share a base directory with another collection (nested layout).
|
|
518
537
|
*/
|
|
519
|
-
async function scanGlobCollection(fs, collectionName, baseRel, pattern, contentDir) {
|
|
538
|
+
async function scanGlobCollection(fs, collectionName, baseRel, pattern, contentDir, frontmatterMemo) {
|
|
520
539
|
const rels = await globLoaderFiles(fs, baseRel, pattern);
|
|
521
540
|
// Markdown collections win when both are present; otherwise build a data
|
|
522
541
|
// collection (yaml/json) — the loader pattern dictates which, and a data
|
|
@@ -525,7 +544,7 @@ async function scanGlobCollection(fs, collectionName, baseRel, pattern, contentD
|
|
|
525
544
|
.filter(relToBase => relToBase.endsWith('.md') || relToBase.endsWith('.mdx'))
|
|
526
545
|
.map(relToBase => ({ slug: relToBase.replace(/\.(md|mdx)$/, ''), relPath: relToBase }));
|
|
527
546
|
if (mdSources.length > 0) {
|
|
528
|
-
return await buildCollectionDefinition(fs, baseRel, mdSources, collectionName, contentDir);
|
|
547
|
+
return await buildCollectionDefinition(fs, baseRel, mdSources, collectionName, contentDir, frontmatterMemo);
|
|
529
548
|
}
|
|
530
549
|
const dataSources = rels
|
|
531
550
|
.filter(relToBase => /\.(ya?ml|json)$/.test(relToBase))
|
|
@@ -1027,10 +1046,12 @@ function patternCoversWholeCollection(pattern, definition) {
|
|
|
1027
1046
|
*
|
|
1028
1047
|
* `contentDir` is a root-relative directory (default `src/content`); all I/O is
|
|
1029
1048
|
* resolved against the injected `CmsFileSystem`'s root. `parseCache` keeps the
|
|
1030
|
-
* mtime-keyed content-config parse result across calls within one core instance
|
|
1049
|
+
* mtime-keyed content-config parse result across calls within one core instance, and
|
|
1050
|
+
* `options.frontmatterCache` each entry's parsed frontmatter (see {@link FrontmatterCache}).
|
|
1031
1051
|
*/
|
|
1032
1052
|
export async function scanCollections(fs, contentDir = 'src/content', parseCache = new Map(), options = {}) {
|
|
1033
1053
|
const collections = {};
|
|
1054
|
+
const frontmatterMemo = options.frontmatterCache ? { cache: options.frontmatterCache, seen: new Set() } : undefined;
|
|
1034
1055
|
/** Collections whose scan threw, by name, as they go into the scan report. */
|
|
1035
1056
|
const failedScans = new Map();
|
|
1036
1057
|
const entries = await fs.list(contentDir);
|
|
@@ -1041,7 +1062,7 @@ export async function scanCollections(fs, contentDir = 'src/content', parseCache
|
|
|
1041
1062
|
.map(async (entry) => {
|
|
1042
1063
|
try {
|
|
1043
1064
|
const collectionPath = path.join(contentDir, entry.name);
|
|
1044
|
-
const definition = await scanCollection(fs, collectionPath, entry.name, contentDir)
|
|
1065
|
+
const definition = await scanCollection(fs, collectionPath, entry.name, contentDir, frontmatterMemo)
|
|
1045
1066
|
?? await scanDataCollection(fs, collectionPath, entry.name, contentDir);
|
|
1046
1067
|
if (definition) {
|
|
1047
1068
|
collections[entry.name] = definition;
|
|
@@ -1089,7 +1110,7 @@ export async function scanCollections(fs, contentDir = 'src/content', parseCache
|
|
|
1089
1110
|
}
|
|
1090
1111
|
let definition;
|
|
1091
1112
|
try {
|
|
1092
|
-
definition = await scanGlobCollection(fs, collectionName, parsedCollection.loaderBase, parsedCollection.loaderPattern, contentDir);
|
|
1113
|
+
definition = await scanGlobCollection(fs, collectionName, parsedCollection.loaderBase, parsedCollection.loaderPattern, contentDir, frontmatterMemo);
|
|
1093
1114
|
}
|
|
1094
1115
|
catch (error) {
|
|
1095
1116
|
console.warn(`[cms] Skipping glob collection "${collectionName}" — scan failed:`, error);
|
|
@@ -1112,6 +1133,8 @@ export async function scanCollections(fs, contentDir = 'src/content', parseCache
|
|
|
1112
1133
|
}
|
|
1113
1134
|
collections[collectionName] = definition;
|
|
1114
1135
|
}
|
|
1136
|
+
if (frontmatterMemo)
|
|
1137
|
+
sweepFrontmatterMemo(frontmatterMemo);
|
|
1115
1138
|
applyParsedConfig(collections, parsed);
|
|
1116
1139
|
detectReferenceFields(collections, parsed);
|
|
1117
1140
|
detectDerivedHrefFields(collections);
|
|
@@ -121,18 +121,29 @@ export type ParseCache = Map<string, {
|
|
|
121
121
|
} & ContentConfigRead>;
|
|
122
122
|
/** Where a project may keep its content config, in the order the parser prefers them. */
|
|
123
123
|
export declare const CONTENT_CONFIG_PATHS: readonly ["src/content/config.ts", "src/content.config.ts"];
|
|
124
|
+
/**
|
|
125
|
+
* Every content config file name, in the order Astro 7 looks for them: it loads the first that exists. It looks at
|
|
126
|
+
* the legacy `src/content/config.*` names only when none of the others exists, and then fails the build unless the
|
|
127
|
+
* Astro config sets `legacy.collectionsBackwardsCompat`.
|
|
128
|
+
*/
|
|
129
|
+
export declare const ASTRO_CONTENT_CONFIG_ORDER: readonly ["src/content.config.mjs", "src/content.config.js", "src/content.config.mts", "src/content.config.ts", "src/content/config.ts", "src/content/config.js", "src/content/config.mjs", "src/content/config.mts"];
|
|
124
130
|
/**
|
|
125
131
|
* Where Astro also takes a content config from and this reader does not look. A project with
|
|
126
132
|
* one of these has a config; it is only out of the reader's sight.
|
|
127
133
|
*/
|
|
128
|
-
export declare const UNREAD_CONTENT_CONFIG_PATHS: readonly [
|
|
134
|
+
export declare const UNREAD_CONTENT_CONFIG_PATHS: readonly string[];
|
|
135
|
+
/** The content config file Astro loads, or `null` when the project has none. */
|
|
136
|
+
export declare function findLoadedContentConfig(fs: CmsFileSystem): Promise<string | null>;
|
|
137
|
+
/** Whether this reader reads the content config at `configPath`. */
|
|
138
|
+
export declare const isReadContentConfig: (configPath: string) => boolean;
|
|
129
139
|
/**
|
|
130
|
-
* Why `parseContentConfig` came back empty.
|
|
131
|
-
*
|
|
140
|
+
* Why `parseContentConfig` came back empty. Four different facts share that one return value, and only two of them
|
|
141
|
+
* are a defect: `unparseable`, and `missing` beside entries. A site with `no-collections` is a legitimate site, and an
|
|
142
|
+
* `unread` config is one Astro loads from a file name this reader does not look at.
|
|
132
143
|
*/
|
|
133
|
-
export type EmptyContentConfigReason = 'missing' | 'unparseable' | 'no-collections';
|
|
144
|
+
export type EmptyContentConfigReason = 'missing' | 'unread' | 'unparseable' | 'no-collections';
|
|
134
145
|
/**
|
|
135
|
-
* Tell the
|
|
146
|
+
* Tell the four apart, for a caller that has to report the empty map rather than just handle it.
|
|
136
147
|
*
|
|
137
148
|
* A parse failure anywhere wins over an empty parse: a config that will not read is a problem to
|
|
138
149
|
* name even when a second one beside it reads cleanly and declares nothing.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-config-ast.d.ts","sourceRoot":"","sources":["../src/content-config-ast.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"content-config-ast.d.ts","sourceRoot":"","sources":["../src/content-config-ast.ts"],"names":[],"mappings":"AAEA,OAAO,EACN,KAAK,gBAAgB,EAErB,KAAK,gBAAgB,EACrB,KAAK,UAAU,EACf,KAAK,SAAS,EAId,KAAK,YAAY,EACjB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAElD,MAAM,WAAW,eAAe;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,WAAW,WAAW;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE;QAAE,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;KAAE,CAAA;IACvC,SAAS,CAAC,EAAE,eAAe,CAAA;IAC3B,2GAA2G;IAC3G,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,sCAAsC;IACtC,QAAQ,CAAC,EAAE,SAAS,CAAA;IACpB,mFAAmF;IACnF,MAAM,CAAC,EAAE,WAAW,EAAE,CAAA;IACtB,6GAA6G;IAC7G,MAAM,CAAC,EAAE,iBAAiB,CAAA;CAC1B;AAED,oEAAoE;AACpE,MAAM,WAAW,iBAAiB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAA;IAC/B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,2FAA2F;IAC3F,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,yEAAyE;IACzE,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;CACnC;AAED,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,+FAA+F;IAC/F,aAAa,CAAC,EAAE,IAAI,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,kFAAkF;IAClF,MAAM,CAAC,EAAE,gBAAgB,CAAA;IACzB,2FAA2F;IAC3F,QAAQ,CAAC,EAAE,YAAY,CAAA;IACvB,kGAAkG;IAClG,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,8FAA8F;IAC9F,QAAQ,CAAC,EAAE,IAAI,CAAA;IACf,2GAA2G;IAC3G,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,6EAA6E;IAC7E,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,kHAAkH;IAClH,MAAM,CAAC,EAAE,IAAI,CAAA;IACb,+FAA+F;IAC/F,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,sGAAsG;IACtG,KAAK,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;AAExD;;;;;;;;GAQG;AACH,MAAM,WAAW,kBAAkB;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,+GAA+G;IAC/G,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,8CAA8C;IAC9C,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,gGAAgG;IAChG,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;IACzB,yCAAyC;IACzC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,sDAAsD;IACtD,SAAS,CAAC,EAAE,IAAI,CAAA;IAChB,kGAAkG;IAClG,QAAQ,CAAC,EAAE,IAAI,CAAA;CACf;AAED,qHAAqH;AACrH,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,YAAY,CAAA;IACpB,uDAAuD;IACvD,QAAQ,EAAE,kBAAkB,EAAE,CAAA;IAC9B;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAA;IAChB;;;OAGG;IACH,kBAAkB,EAAE,OAAO,CAAA;CAC3B;AAED,sEAAsE;AACtE,MAAM,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,iBAAiB,CAAC,CAAA;AAoK7E,yFAAyF;AACzF,eAAO,MAAM,oBAAoB,6DAA8D,CAAA;AAE/F;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,uNAS7B,CAAA;AAIV;;;GAGG;AACH,eAAO,MAAM,2BAA2B,EAAE,SAAS,MAAM,EAExD,CAAA;AAED,gFAAgF;AAChF,wBAAsB,uBAAuB,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAKvF;AAED,oEAAoE;AACpE,eAAO,MAAM,mBAAmB,GAAI,YAAY,MAAM,KAAG,OAAoD,CAAA;AAE7G;;;;GAIG;AACH,MAAM,MAAM,wBAAwB,GAAG,SAAS,GAAG,QAAQ,GAAG,aAAa,GAAG,gBAAgB,CAAA;AAE9F;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAWrG;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAEpG;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAuBxG;AAED,wEAAwE;AACxE,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,YAAY,CAEpF;AA+bD;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,IAAI,CAoB9F"}
|
|
@@ -162,38 +162,56 @@ function parseSource(source) {
|
|
|
162
162
|
/** Where a project may keep its content config, in the order the parser prefers them. */
|
|
163
163
|
export const CONTENT_CONFIG_PATHS = ['src/content/config.ts', 'src/content.config.ts'];
|
|
164
164
|
/**
|
|
165
|
-
*
|
|
166
|
-
*
|
|
165
|
+
* Every content config file name, in the order Astro 7 looks for them: it loads the first that exists. It looks at
|
|
166
|
+
* the legacy `src/content/config.*` names only when none of the others exists, and then fails the build unless the
|
|
167
|
+
* Astro config sets `legacy.collectionsBackwardsCompat`.
|
|
167
168
|
*/
|
|
168
|
-
export const
|
|
169
|
+
export const ASTRO_CONTENT_CONFIG_ORDER = [
|
|
169
170
|
'src/content.config.mjs',
|
|
170
171
|
'src/content.config.js',
|
|
171
172
|
'src/content.config.mts',
|
|
172
|
-
'src/content
|
|
173
|
+
'src/content.config.ts',
|
|
174
|
+
'src/content/config.ts',
|
|
173
175
|
'src/content/config.js',
|
|
176
|
+
'src/content/config.mjs',
|
|
174
177
|
'src/content/config.mts',
|
|
175
178
|
];
|
|
179
|
+
const READ_CONTENT_CONFIG_PATHS = new Set(CONTENT_CONFIG_PATHS);
|
|
180
|
+
/**
|
|
181
|
+
* Where Astro also takes a content config from and this reader does not look. A project with
|
|
182
|
+
* one of these has a config; it is only out of the reader's sight.
|
|
183
|
+
*/
|
|
184
|
+
export const UNREAD_CONTENT_CONFIG_PATHS = ASTRO_CONTENT_CONFIG_ORDER.filter(configPath => !READ_CONTENT_CONFIG_PATHS.has(configPath));
|
|
185
|
+
/** The content config file Astro loads, or `null` when the project has none. */
|
|
186
|
+
export async function findLoadedContentConfig(fs) {
|
|
187
|
+
for (const configPath of ASTRO_CONTENT_CONFIG_ORDER) {
|
|
188
|
+
if (await fs.exists(configPath))
|
|
189
|
+
return configPath;
|
|
190
|
+
}
|
|
191
|
+
return null;
|
|
192
|
+
}
|
|
193
|
+
/** Whether this reader reads the content config at `configPath`. */
|
|
194
|
+
export const isReadContentConfig = (configPath) => READ_CONTENT_CONFIG_PATHS.has(configPath);
|
|
176
195
|
/**
|
|
177
|
-
* Tell the
|
|
196
|
+
* Tell the four apart, for a caller that has to report the empty map rather than just handle it.
|
|
178
197
|
*
|
|
179
198
|
* A parse failure anywhere wins over an empty parse: a config that will not read is a problem to
|
|
180
199
|
* name even when a second one beside it reads cleanly and declares nothing.
|
|
181
200
|
*/
|
|
182
201
|
export async function classifyEmptyContentConfig(fs) {
|
|
183
|
-
|
|
202
|
+
const loaded = await findLoadedContentConfig(fs);
|
|
203
|
+
if (loaded === null)
|
|
204
|
+
return 'missing';
|
|
205
|
+
if (!isReadContentConfig(loaded))
|
|
206
|
+
return 'unread';
|
|
184
207
|
for (const configPath of CONTENT_CONFIG_PATHS) {
|
|
185
|
-
|
|
186
|
-
await fs.stat(configPath);
|
|
187
|
-
}
|
|
188
|
-
catch {
|
|
208
|
+
if (!(await fs.exists(configPath)))
|
|
189
209
|
continue;
|
|
190
|
-
}
|
|
191
|
-
found = true;
|
|
192
210
|
if (parseSource(await fs.readFile(configPath)) === null) {
|
|
193
211
|
return 'unparseable';
|
|
194
212
|
}
|
|
195
213
|
}
|
|
196
|
-
return
|
|
214
|
+
return 'no-collections';
|
|
197
215
|
}
|
|
198
216
|
/**
|
|
199
217
|
* Parse the project's Astro content config file (TypeScript) into a structured
|
package/dist/core.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"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"}
|
package/dist/core.js
CHANGED
|
@@ -11,6 +11,8 @@ export function createCmsCore(fs, opts = {}) {
|
|
|
11
11
|
const commit = opts.commit;
|
|
12
12
|
// One mtime-keyed content-config parse cache per core instance (per project root).
|
|
13
13
|
const parseCache = new Map();
|
|
14
|
+
// Each entry's parsed frontmatter, so a rescan after one save parses only that entry.
|
|
15
|
+
const frontmatterCache = new Map();
|
|
14
16
|
function entryDeps(over) {
|
|
15
17
|
return {
|
|
16
18
|
fs: over,
|
|
@@ -32,7 +34,7 @@ export function createCmsCore(fs, opts = {}) {
|
|
|
32
34
|
}
|
|
33
35
|
return {
|
|
34
36
|
scanCollections(options) {
|
|
35
|
-
return scanCollections(fs, contentDir, parseCache, { report: options?.report ?? false });
|
|
37
|
+
return scanCollections(fs, contentDir, parseCache, { report: options?.report ?? false, frontmatterCache });
|
|
36
38
|
},
|
|
37
39
|
collectionScanReport,
|
|
38
40
|
scanComponents() {
|
package/dist/portable.d.ts
CHANGED
|
@@ -11,9 +11,9 @@ export { checkFieldShapes, type ShapeCheckInput } from './check-shape.ts';
|
|
|
11
11
|
export { checkScriptSource, type CompiledAstro, parseScriptWithBabel, type ScriptSyntaxError, type SourceCheckPorts, type SourceKind, sourceKind, } from './check-source.ts';
|
|
12
12
|
export { checkEditorWrites, type WriteCheckInput } from './check-write.ts';
|
|
13
13
|
export { checkContent, type CheckContentOptions, type CheckFinding, type CheckReport, type CheckSeverity, formatCheckReport } from './check.ts';
|
|
14
|
-
export { collectionScanReport, scanCollections } from './collection-scanner.ts';
|
|
14
|
+
export { collectionScanReport, type FrontmatterCache, scanCollections } from './collection-scanner.ts';
|
|
15
15
|
export { scanComponentDefinitions } from './component-registry.ts';
|
|
16
|
-
export { classifyEmptyContentConfig, CONTENT_CONFIG_PATHS, type ContentConfigRead, type DeclaredCollection, type EmptyContentConfigReason, type ParseCache, parseConfigSource, parseContentConfig, type ParsedCollection, type ParsedConfig, type ParsedField, type ParsedReference, readContentConfig, UNREAD_CONTENT_CONFIG_PATHS, } from './content-config-ast.ts';
|
|
16
|
+
export { ASTRO_CONTENT_CONFIG_ORDER, classifyEmptyContentConfig, CONTENT_CONFIG_PATHS, type ContentConfigRead, type DeclaredCollection, type EmptyContentConfigReason, type ParseCache, parseConfigSource, parseContentConfig, type ParsedCollection, type ParsedConfig, type ParsedField, type ParsedReference, readContentConfig, UNREAD_CONTENT_CONFIG_PATHS, } from './content-config-ast.ts';
|
|
17
17
|
export { createCmsCore } from './core.ts';
|
|
18
18
|
export type { CmsCore, CmsCoreOptions } from './core.ts';
|
|
19
19
|
export { applyCreateRouteFields, blankFieldValue, blankRequiredFields, type CollectionKind, type CreateWriteField, isBlankFieldValue, newEntryFrontmatter, newRepeaterItem, normalizeCreateWrite, omitEmptyOnCreate, type RepeaterItemField, type RequiredGuardField, seedValueForRequiredField, withoutBlankArrayItems, type WriteModelField, } from './editor-write-model.ts';
|
package/dist/portable.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portable.d.ts","sourceRoot":"","sources":["../src/portable.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AACzD,OAAO,EACN,kBAAkB,EAClB,kBAAkB,EAClB,KAAK,sBAAsB,EAC3B,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,GACtB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,KAAK,SAAS,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClE,OAAO,EACN,cAAc,EACd,SAAS,EACT,eAAe,EACf,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,WAAW,EAChB,aAAa,EACb,UAAU,GACV,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,mBAAmB,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAC1E,OAAO,EAAE,gBAAgB,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACzE,OAAO,EACN,iBAAiB,EACjB,KAAK,aAAa,EAClB,oBAAoB,EACpB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,UAAU,EACf,UAAU,GACV,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAC1E,OAAO,EAAE,YAAY,EAAE,KAAK,mBAAmB,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,aAAa,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC/I,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"portable.d.ts","sourceRoot":"","sources":["../src/portable.ts"],"names":[],"mappings":"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"}
|
package/dist/portable.js
CHANGED
|
@@ -13,7 +13,7 @@ export { checkEditorWrites } from "./check-write.js";
|
|
|
13
13
|
export { checkContent, formatCheckReport } from "./check.js";
|
|
14
14
|
export { collectionScanReport, scanCollections } from "./collection-scanner.js";
|
|
15
15
|
export { scanComponentDefinitions } from "./component-registry.js";
|
|
16
|
-
export { classifyEmptyContentConfig, CONTENT_CONFIG_PATHS, parseConfigSource, parseContentConfig, readContentConfig, UNREAD_CONTENT_CONFIG_PATHS, } from "./content-config-ast.js";
|
|
16
|
+
export { ASTRO_CONTENT_CONFIG_ORDER, classifyEmptyContentConfig, CONTENT_CONFIG_PATHS, parseConfigSource, parseContentConfig, readContentConfig, UNREAD_CONTENT_CONFIG_PATHS, } from "./content-config-ast.js";
|
|
17
17
|
export { createCmsCore } from "./core.js";
|
|
18
18
|
export { applyCreateRouteFields, blankFieldValue, blankRequiredFields, isBlankFieldValue, newEntryFrontmatter, newRepeaterItem, normalizeCreateWrite, omitEmptyOnCreate, seedValueForRequiredField, withoutBlankArrayItems, } from "./editor-write-model.js";
|
|
19
19
|
export { globMayMatchUnder, globToRegExp, UnreadableDirectoryError } from "./fs/glob.js";
|