@unbase-app/layer 0.0.0-stage → 2.0.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/LICENSE +21 -0
- package/README.md +400 -2
- package/bin/unbase-layer.mjs +28 -0
- package/cli/artifact-style.mjs +89 -0
- package/cli/fetch.mjs +142 -0
- package/cli/lib.mjs +160 -0
- package/cli/live.mjs +35 -0
- package/cli/overview-artifact.mjs +142 -0
- package/cli/plan-artifact.mjs +337 -0
- package/cli/post.mjs +309 -0
- package/cli/redispatch.mjs +99 -0
- package/cli/screenshot.mjs +189 -0
- package/cli/status.mjs +50 -0
- package/cli/store.mjs +143 -0
- package/dist/client/start.d.ts +4 -0
- package/dist/client/start.js +12888 -0
- package/package.json +119 -4
- package/skills/build-comment/SKILL.md +61 -0
- package/skills/get-comments/SKILL.md +127 -0
- package/skills/process-comments/SKILL.md +115 -0
- package/skills/propose-comment/SKILL.md +79 -0
- package/src/astro/component-marker.mjs +161 -0
- package/src/astro/content-map-extra.mjs +192 -0
- package/src/astro/content-map.mjs +584 -0
- package/src/astro/deploy-context.mjs +66 -0
- package/src/astro/index.d.ts +97 -0
- package/src/astro/index.mjs +277 -0
- package/src/astro/pages.mjs +192 -0
- package/src/astro/version.mjs +13 -0
- package/src/edit/index.d.mts +178 -0
- package/src/edit/index.mjs +1002 -0
- package/src/page/index.d.mts +71 -0
- package/src/page/index.mjs +216 -0
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
// ============================================================================
|
|
2
|
+
// COMPONENT MARKER — Vite plugin of comment mode (?comment).
|
|
3
|
+
//
|
|
4
|
+
// At build time it puts `data-c="<folder>/<Name>"` on the root element of every
|
|
5
|
+
// .astro component in src/components/, so that on a click the comment layer
|
|
6
|
+
// knows in which component someone clicked. Setting an attribute by hand in
|
|
7
|
+
// ~100 files drifts within a month; this follows the file name by itself.
|
|
8
|
+
//
|
|
9
|
+
// The title for such a path comes from the integration option `titles` (e.g.
|
|
10
|
+
// derived from a component registry with keyFromPath); that small map goes
|
|
11
|
+
// along in the virtual config module, not the whole registry.
|
|
12
|
+
//
|
|
13
|
+
// Which elements it marks: the outermost of the template, also in every branch
|
|
14
|
+
// of a condition and inside the slot content of a wrapper like <Section>.
|
|
15
|
+
// What it skips on purpose:
|
|
16
|
+
// - Folders from `skip` (default dev/: a workbench, frozen snapshots).
|
|
17
|
+
// - A component that only passes on another component or a <slot/>: there is
|
|
18
|
+
// no element of its own. The comment layer falls back to the nearest
|
|
19
|
+
// surrounding component.
|
|
20
|
+
// - React islands: the comment layer knows them by their <astro-island>
|
|
21
|
+
// wrapper.
|
|
22
|
+
//
|
|
23
|
+
// The attribute is invisible and touches no style. It hangs on the `load`
|
|
24
|
+
// hook (not on `transform`): Astro's own compiler runs as a pre-transform, and
|
|
25
|
+
// through `load` it gets the source with the attribute also on its own reload
|
|
26
|
+
// path (loadId) — otherwise compile metadata and module differ.
|
|
27
|
+
//
|
|
28
|
+
// JavaScript, not TypeScript: see the header of index.mjs.
|
|
29
|
+
// ============================================================================
|
|
30
|
+
|
|
31
|
+
import { readFile } from "node:fs/promises";
|
|
32
|
+
import { relative, sep } from "node:path";
|
|
33
|
+
import { parse } from "@astrojs/compiler-rs";
|
|
34
|
+
|
|
35
|
+
/** "@/components/layout/VibeHero.astro" → "layout/VibeHero"
|
|
36
|
+
* @param {string} path @param {string} [dir] */
|
|
37
|
+
export function keyFromPath(path, dir = "src/components") {
|
|
38
|
+
return path
|
|
39
|
+
.replace(/^@\/components\//, "")
|
|
40
|
+
.replace(new RegExp("^" + dir.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "/"), "")
|
|
41
|
+
.replace(/\.(astro|tsx|jsx)$/, "");
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/** Tags that are never a visible root element. */
|
|
45
|
+
const NEVER_ROOT = new Set(["style", "script", "slot", "template", "meta", "link", "title", "head", "html", "body", "fragment"]);
|
|
46
|
+
|
|
47
|
+
// Astro's own parser (the same one the build uses) gives the template as a
|
|
48
|
+
// JSX-like tree with character positions. On it we look for the outermost
|
|
49
|
+
// elements of the component — also in every branch of a {a ? (…) : (…)}, in a
|
|
50
|
+
// {list.map(…)} and inside the slot content of a wrapper like <Section> —
|
|
51
|
+
// without having to parse HTML or JavaScript ourselves.
|
|
52
|
+
|
|
53
|
+
/** @param {any} open @returns {string | null} */
|
|
54
|
+
function nameOf(open) {
|
|
55
|
+
const n = open?.name;
|
|
56
|
+
if (!n) return null;
|
|
57
|
+
if (n.type === "JSXIdentifier") return String(n.name);
|
|
58
|
+
return null; // <a.b> or <x:y>: do not mark
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
/**
|
|
62
|
+
* Puts `data-c` on the outermost elements of the template. Returns null when
|
|
63
|
+
* there was nothing to mark (only text, or only a <slot/>).
|
|
64
|
+
* @param {string} source @param {string} key @returns {string | null}
|
|
65
|
+
*/
|
|
66
|
+
export function mark(source, key) {
|
|
67
|
+
/** @type {any} */
|
|
68
|
+
let ast;
|
|
69
|
+
try {
|
|
70
|
+
const r = parse(source).ast;
|
|
71
|
+
ast = typeof r === "string" ? JSON.parse(r) : r;
|
|
72
|
+
} catch {
|
|
73
|
+
return null;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
// What the frontmatter imports is a component; a capitalised tag that is
|
|
77
|
+
// not imported is a dynamic element (const Tag = "a").
|
|
78
|
+
const imported = new Set();
|
|
79
|
+
const program = ast.frontmatter?.program;
|
|
80
|
+
for (const d of program?.body ?? []) {
|
|
81
|
+
if (d.type !== "ImportDeclaration") continue;
|
|
82
|
+
for (const sp of d.specifiers ?? []) {
|
|
83
|
+
const name = sp.local?.name;
|
|
84
|
+
if (name) imported.add(String(name));
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
/** @type {number[]} */
|
|
89
|
+
const spots = [];
|
|
90
|
+
|
|
91
|
+
/** @param {any} n */
|
|
92
|
+
const visit = (n) => {
|
|
93
|
+
if (!n || typeof n !== "object") return;
|
|
94
|
+
if (Array.isArray(n)) {
|
|
95
|
+
n.forEach(visit);
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
if (n.type === "JSXElement") {
|
|
99
|
+
const open = n.openingElement;
|
|
100
|
+
const name = nameOf(open);
|
|
101
|
+
if (!name || typeof open?.start !== "number") return;
|
|
102
|
+
const isElement = /^[a-z]/.test(name);
|
|
103
|
+
if (isElement && NEVER_ROOT.has(name)) return;
|
|
104
|
+
if (isElement || !imported.has(name)) {
|
|
105
|
+
// Check: is "<name" really at that spot? Otherwise rather nothing.
|
|
106
|
+
if (source.slice(open.start, open.start + 1 + name.length) === `<${name}`) {
|
|
107
|
+
spots.push(open.start + 1 + name.length);
|
|
108
|
+
}
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
if (name === "Fragment" || imported.has(name)) {
|
|
112
|
+
// Wrapper component: its slot content is markup of this component.
|
|
113
|
+
visit(n.children);
|
|
114
|
+
}
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
if (n.type === "JSXText" || n.type === "AstroFrontmatter") return;
|
|
118
|
+
// Fragment, expression container, and every JavaScript node inside it
|
|
119
|
+
// (ternary, &&, .map callback): keep looking for JSX.
|
|
120
|
+
for (const [field, value] of Object.entries(n)) {
|
|
121
|
+
if (field === "frontmatter" || field === "comments") continue;
|
|
122
|
+
if (value && typeof value === "object") visit(value);
|
|
123
|
+
}
|
|
124
|
+
};
|
|
125
|
+
|
|
126
|
+
visit(ast.body);
|
|
127
|
+
if (spots.length === 0) return null;
|
|
128
|
+
|
|
129
|
+
let out = source;
|
|
130
|
+
for (const p of [...new Set(spots)].sort((a, b) => b - a)) {
|
|
131
|
+
out = out.slice(0, p) + ` data-c="${key}"` + out.slice(p);
|
|
132
|
+
}
|
|
133
|
+
return out;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/**
|
|
137
|
+
* @param {import("./index").MarkerOptions} [options]
|
|
138
|
+
* @returns {import("vite").Plugin}
|
|
139
|
+
*/
|
|
140
|
+
export default function componentMarker(options = {}) {
|
|
141
|
+
const dir = (options.dir ?? "src/components").replace(/\/$/, "");
|
|
142
|
+
const skip = (options.skip ?? ["dev/"]).map((s) => `${dir}/${s.replace(/^\//, "")}`);
|
|
143
|
+
let root = process.cwd();
|
|
144
|
+
return {
|
|
145
|
+
name: "comment-modus:component-marker",
|
|
146
|
+
enforce: "pre",
|
|
147
|
+
configResolved(config) {
|
|
148
|
+
root = config.root;
|
|
149
|
+
},
|
|
150
|
+
async load(id) {
|
|
151
|
+
// Only the main file, not Astro's ?astro&type=style sub-requests.
|
|
152
|
+
if (id.includes("?") || !id.endsWith(".astro")) return null;
|
|
153
|
+
const rel = relative(root, id).split(sep).join("/");
|
|
154
|
+
if (!rel.startsWith(dir + "/") || skip.some((s) => rel.startsWith(s))) return null;
|
|
155
|
+
|
|
156
|
+
const source = await readFile(id, "utf8");
|
|
157
|
+
const marked = mark(source, keyFromPath(rel, dir));
|
|
158
|
+
return marked ?? null;
|
|
159
|
+
},
|
|
160
|
+
};
|
|
161
|
+
}
|
|
@@ -0,0 +1,192 @@
|
|
|
1
|
+
// ============================================================================
|
|
2
|
+
// CONTENT MAP EXTRA — what the content map gives besides the texts, for the
|
|
3
|
+
// page settings (B2) and the images (B3). Plan: docs/plan-edit-mode.md in
|
|
4
|
+
// agendavoorhethart. content-map.mjs calls extraOf() per JSON file and puts the
|
|
5
|
+
// result in the map:
|
|
6
|
+
//
|
|
7
|
+
// booleans file → pointer → boolean (noindex, switches)
|
|
8
|
+
// images file → pointer of the source → { value, paths }
|
|
9
|
+
// settings file → { route, fields: { titel, beschrijving, ogImage,
|
|
10
|
+
// noindex } }: for every file that belongs to a route, where
|
|
11
|
+
// each field is (or may go) and whether it is there yet
|
|
12
|
+
// routes the collection for new route files: { dir, fields }
|
|
13
|
+
// site file → { fields: { naam: { pointer, exists, value? }, … } }:
|
|
14
|
+
// the site settings (1.3.0), see below
|
|
15
|
+
//
|
|
16
|
+
// (Under these English names only since 2.0; the engine's readMap still reads
|
|
17
|
+
// the Dutch keys of a map from before 1.11.)
|
|
18
|
+
//
|
|
19
|
+
// THE FIELD CONTRACT (also in the README, Edit mode; avhh C2). The field names
|
|
20
|
+
// are the site's content, as agendavoorhethart names them, and Unbase's
|
|
21
|
+
// publish creates them: they stay Dutch.
|
|
22
|
+
//
|
|
23
|
+
// Page settings live in a route file: JSON with at the top
|
|
24
|
+
// "pad": "/the/route" and an object "seo" with titel, beschrijving, ogImage
|
|
25
|
+
// (an image path "/images/…"), noindex (boolean) and zoeken (boolean: false =
|
|
26
|
+
// not in the site's search; 1.3.0), all five optional. What is there wins on
|
|
27
|
+
// the page over what the page itself passes (the site takes care of that).
|
|
28
|
+
// The file name is the path without its first slash, "/" as "-", and "/"
|
|
29
|
+
// itself is home.json. A collection whose schema has the properties pad and
|
|
30
|
+
// seo is the place for new route files: when a route has none yet, Publish
|
|
31
|
+
// creates it.
|
|
32
|
+
//
|
|
33
|
+
// Site settings (1.3.0) live in one file of a collection whose schema
|
|
34
|
+
// carries .meta({ "x-settings": "site" }) at the top (LEGACY-NL:
|
|
35
|
+
// "x-instellingen" before 1.11), with these fields at the top: naam,
|
|
36
|
+
// beschrijving, taal ("nl", "en"), favicon and faviconDonker (image paths),
|
|
37
|
+
// ogImage (the default share image) and googleAnalytics (a measurement ID
|
|
38
|
+
// "G-…", or empty). Only naam is required; what is missing, the site takes
|
|
39
|
+
// care of itself (a favicon in public/). Their texts are no page text: they
|
|
40
|
+
// are not in `files`, only in `site`, with their value.
|
|
41
|
+
//
|
|
42
|
+
// Images: a string with a path to an image ("/images/…" with an image
|
|
43
|
+
// extension), or a string that carries .meta({ "x-image": … }) in the schema
|
|
44
|
+
// (LEGACY-NL: "x-beeld"). Three fields in the same object belong to the
|
|
45
|
+
// source:
|
|
46
|
+
// alt string, the alt text
|
|
47
|
+
// positie string, CSS object-position ("50% 40%"), the focal point
|
|
48
|
+
// uitsnede { x, y, breedte, hoogte } in fractions (0–1) of the source image
|
|
49
|
+
// When the source is called beeld, src, image, afbeelding or foto, they are
|
|
50
|
+
// called that; when it is called something else (e.g. logo), then logoAlt,
|
|
51
|
+
// logoPositie, logoUitsnede.
|
|
52
|
+
// x-image: { alt: "bijschrift", crop: false } renames one or turns it off.
|
|
53
|
+
// A field counts when it is there, or when the schema allows it.
|
|
54
|
+
// ============================================================================
|
|
55
|
+
|
|
56
|
+
const escapePart = (s) => String(s).replace(/~/g, "~0").replace(/\//g, "~1");
|
|
57
|
+
const pointerParts = (p) => p.split("/").slice(1).map((d) => d.replace(/~1/g, "/").replace(/~0/g, "~"));
|
|
58
|
+
|
|
59
|
+
export const IMAGE_PATH = /^\/images\/.+\.(jpe?g|png|webp|avif)$/i;
|
|
60
|
+
export const IMAGE_NAMES = new Set(["beeld", "src", "image", "afbeelding", "foto"]);
|
|
61
|
+
export const SETTINGS = ["titel", "beschrijving", "ogImage", "noindex", "zoeken"];
|
|
62
|
+
export const SITE_SETTINGS = ["naam", "beschrijving", "taal", "favicon", "faviconDonker", "ogImage", "googleAnalytics"];
|
|
63
|
+
const ROUTE = /^\/([^/]+(\/[^/]+)*)?$/;
|
|
64
|
+
const TYPE = { titel: "string", beschrijving: "string", ogImage: "string", noindex: "boolean", zoeken: "boolean" };
|
|
65
|
+
|
|
66
|
+
/** The file with the site settings: its schema carries x-settings "site". */
|
|
67
|
+
export const isSiteSettings = (schema) =>
|
|
68
|
+
// LEGACY-NL: "x-instellingen" is the name from before 1.11 (agendavoorhethart's content.config,
|
|
69
|
+
// Unbase's kit reads it too).
|
|
70
|
+
Boolean(schema && (schema["x-settings"] === "site" || schema["x-instellingen"] === "site"));
|
|
71
|
+
|
|
72
|
+
function valueAt(data, pointer) {
|
|
73
|
+
let o = data;
|
|
74
|
+
for (const d of pointerParts(pointer)) {
|
|
75
|
+
if (o === null || typeof o !== "object") return undefined;
|
|
76
|
+
o = Array.isArray(o) ? (/^\d+$/.test(d) ? o[Number(d)] : undefined) : Object.prototype.hasOwnProperty.call(o, d) ? o[d] : undefined;
|
|
77
|
+
}
|
|
78
|
+
return o;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
/** The x-image meta of a subschema (also inside anyOf), or null. */
|
|
82
|
+
function imageMeta(s) {
|
|
83
|
+
if (!s) return null;
|
|
84
|
+
// LEGACY-NL: "x-beeld" is the name from before 1.11.
|
|
85
|
+
const metaOf = (o) => o?.["x-image"] ?? o?.["x-beeld"];
|
|
86
|
+
if (metaOf(s) !== undefined) return metaOf(s);
|
|
87
|
+
for (const o of s.anyOf ?? []) if (metaOf(o) !== undefined) return metaOf(o);
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
/** The names of alt, positie and uitsnede next to a source with this key. The
|
|
92
|
+
* roles are named after the site's fields (positie, uitsnede). */
|
|
93
|
+
export function companionNames(key, meta) {
|
|
94
|
+
const names = IMAGE_NAMES.has(key)
|
|
95
|
+
? { alt: "alt", positie: "positie", uitsnede: "uitsnede" }
|
|
96
|
+
: { alt: `${key}Alt`, positie: `${key}Positie`, uitsnede: `${key}Uitsnede` };
|
|
97
|
+
if (meta && typeof meta === "object") {
|
|
98
|
+
// The meta names a role in English (position, crop) or as the field is called (positie, uitsnede).
|
|
99
|
+
const said = { alt: meta.alt, positie: meta.position ?? meta.positie, uitsnede: meta.crop ?? meta.uitsnede };
|
|
100
|
+
for (const k of ["alt", "positie", "uitsnede"]) {
|
|
101
|
+
if (said[k] === false) names[k] = null;
|
|
102
|
+
else if (typeof said[k] === "string" && said[k]) names[k] = said[k];
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
return names;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
/**
|
|
109
|
+
* @param {unknown} data the JSON of one file
|
|
110
|
+
* @param {object|null} schema the collection's JSON Schema
|
|
111
|
+
* @param {(s: object, p: string) => object|null} subschema
|
|
112
|
+
*/
|
|
113
|
+
export function extraOf(data, schema, subschema) {
|
|
114
|
+
const booleans = {};
|
|
115
|
+
const images = {};
|
|
116
|
+
const knows = (p) => Boolean(schema && subschema(schema, p));
|
|
117
|
+
|
|
118
|
+
const visit = (v, p, key) => {
|
|
119
|
+
if (typeof v === "boolean") booleans[p] = v;
|
|
120
|
+
else if (typeof v === "string") {
|
|
121
|
+
const meta = schema ? imageMeta(subschema(schema, p)) : null;
|
|
122
|
+
if (meta === false) return;
|
|
123
|
+
if (!(meta || IMAGE_PATH.test(v))) return;
|
|
124
|
+
const parentPointer = p.slice(0, p.lastIndexOf("/"));
|
|
125
|
+
const names = companionNames(key, meta);
|
|
126
|
+
const paths = {};
|
|
127
|
+
const value = { src: v };
|
|
128
|
+
for (const k of ["alt", "positie", "uitsnede"]) {
|
|
129
|
+
if (!names[k]) continue;
|
|
130
|
+
const sp = `${parentPointer}/${escapePart(names[k])}`;
|
|
131
|
+
const current = valueAt(data, sp);
|
|
132
|
+
const valid = k === "uitsnede" ? current && typeof current === "object" : typeof current === "string";
|
|
133
|
+
if (current !== undefined && !valid) continue; // something other than expected: leave it alone
|
|
134
|
+
if (current === undefined && !knows(sp)) continue;
|
|
135
|
+
paths[k] = sp;
|
|
136
|
+
if (current !== undefined) value[k] = current;
|
|
137
|
+
}
|
|
138
|
+
images[p] = { value, paths };
|
|
139
|
+
} else if (Array.isArray(v)) v.forEach((x, i) => visit(x, `${p}/${i}`, String(i)));
|
|
140
|
+
else if (v && typeof v === "object") {
|
|
141
|
+
for (const [k, x] of Object.entries(v)) if (k !== "$schema") visit(x, `${p}/${escapePart(k)}`, k);
|
|
142
|
+
}
|
|
143
|
+
};
|
|
144
|
+
visit(data, "", "");
|
|
145
|
+
|
|
146
|
+
// A route file: "pad" at the top, and a seo object (or a schema that knows it).
|
|
147
|
+
const route = valueAt(data, "/pad");
|
|
148
|
+
const seo = valueAt(data, "/seo");
|
|
149
|
+
let settings = {};
|
|
150
|
+
if (typeof route === "string" && ROUTE.test(route) && ((seo && typeof seo === "object" && !Array.isArray(seo)) || knows("/seo"))) {
|
|
151
|
+
const fields = {};
|
|
152
|
+
for (const field of SETTINGS) {
|
|
153
|
+
const p = `/seo/${field}`;
|
|
154
|
+
const v = valueAt(data, p);
|
|
155
|
+
if (typeof v === TYPE[field]) fields[field] = { pointer: p, exists: true };
|
|
156
|
+
else if (v === undefined && (knows(p) || !schema)) fields[field] = { pointer: p, exists: false };
|
|
157
|
+
}
|
|
158
|
+
settings = { route, fields };
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
// The site settings: every field that is there (with its value) or that the schema knows.
|
|
162
|
+
let site = {};
|
|
163
|
+
if (isSiteSettings(schema)) {
|
|
164
|
+
const fields = {};
|
|
165
|
+
for (const field of SITE_SETTINGS) {
|
|
166
|
+
const p = `/${field}`;
|
|
167
|
+
const v = valueAt(data, p);
|
|
168
|
+
if (typeof v === "string") fields[field] = { pointer: p, exists: true, value: v };
|
|
169
|
+
else if (v === undefined && knows(p)) fields[field] = { pointer: p, exists: false };
|
|
170
|
+
}
|
|
171
|
+
site = { fields };
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
return { booleans, images, settings, site };
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
/** "/" → "home", "/over-ons/team" → "over-ons-team" (the agreement of avhh C2). */
|
|
178
|
+
export function routeName(route) {
|
|
179
|
+
return route === "/" ? "home" : route.replace(/^\//, "").replace(/\//g, "-");
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
/** The collection for route files: a schema with the properties pad and seo.
|
|
183
|
+
* @param {Record<string, object>} schemas collection → JSON Schema
|
|
184
|
+
* @param {string} content the content folder ("src/content") */
|
|
185
|
+
export function routeCollection(schemas, content, subschema) {
|
|
186
|
+
for (const [collection, s] of Object.entries(schemas)) {
|
|
187
|
+
if (!subschema(s, "/pad") || !subschema(s, "/seo")) continue;
|
|
188
|
+
const fields = SETTINGS.filter((f) => subschema(s, `/seo/${f}`));
|
|
189
|
+
if (fields.length) return { dir: `${content}/${collection}`, fields };
|
|
190
|
+
}
|
|
191
|
+
return null;
|
|
192
|
+
}
|