@devbie/newbie-cli 1.1.0 → 1.2.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/dist/assemble/env.js
CHANGED
|
@@ -43,6 +43,7 @@ async function assembleEnv(params) {
|
|
|
43
43
|
if (removedKeys.size > 0) {
|
|
44
44
|
lines = (0, env_file_1.pruneEmptySections)((0, env_file_1.removeEnvKeys)(lines, removedKeys));
|
|
45
45
|
}
|
|
46
|
+
lines = (0, env_file_1.normalizeSections)(lines);
|
|
46
47
|
const serialized = (0, env_file_1.serializeEnv)(lines);
|
|
47
48
|
if (serialized !== raw) {
|
|
48
49
|
await sink.writeText(paths_1.ENV_PATH, serialized);
|
|
@@ -52,14 +53,16 @@ async function assembleEnvExample(params) {
|
|
|
52
53
|
const { cwd, sink, issues, enabled } = params;
|
|
53
54
|
const decoration = "# ----------------------------------------------------------------------------------";
|
|
54
55
|
const sectionLines = [];
|
|
55
|
-
for (const key of enabled) {
|
|
56
|
+
for (const key of [...enabled].sort(env_file_1.compareStrings)) {
|
|
56
57
|
const manifest = await (0, module_install_1.readInstalledManifest)(cwd, key);
|
|
57
58
|
if (manifest === null) {
|
|
58
59
|
(0, issues_1.reportIssue)(issues, sink, `Missing newbie.module.json for '${key}'; excluded from ${paths_1.ENV_EXAMPLE_PATH}.`);
|
|
59
60
|
continue;
|
|
60
61
|
}
|
|
61
62
|
sectionLines.push(decoration, `# ! ${sectionTitle(key)} variables`, decoration);
|
|
62
|
-
|
|
63
|
+
const entries = Object.entries(manifest.env ?? {});
|
|
64
|
+
entries.sort(([a], [b]) => (0, env_file_1.compareStrings)(a, b));
|
|
65
|
+
for (const [envKey, value] of entries) {
|
|
63
66
|
sectionLines.push(`${envKey}=${value}`);
|
|
64
67
|
}
|
|
65
68
|
}
|
package/dist/assemble/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/assemble/env.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/assemble/env.ts"],"names":[],"mappings":"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"}
|
package/dist/core/env-file.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ export type EnvLine = {
|
|
|
8
8
|
key: string;
|
|
9
9
|
value: string;
|
|
10
10
|
};
|
|
11
|
+
export declare function compareStrings(a: string, b: string): number;
|
|
11
12
|
export declare function parseEnv(content: string): EnvLine[];
|
|
12
13
|
export declare function serializeEnv(lines: EnvLine[]): string;
|
|
13
14
|
export declare function envValues(lines: EnvLine[]): Record<string, string>;
|
|
@@ -16,4 +17,5 @@ export declare function upsertEnvSection(lines: EnvLine[], title: string, entrie
|
|
|
16
17
|
export declare function pruneEmptySections(lines: EnvLine[]): EnvLine[];
|
|
17
18
|
export declare const MODULES_MARKER_START = "# @@newbie-modules-start";
|
|
18
19
|
export declare const MODULES_MARKER_END = "# @@newbie-modules-end";
|
|
20
|
+
export declare function normalizeSections(lines: EnvLine[]): EnvLine[];
|
|
19
21
|
export declare function replaceMarkedBlock(content: string, body: string): string;
|
package/dist/core/env-file.js
CHANGED
|
@@ -1,16 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MODULES_MARKER_END = exports.MODULES_MARKER_START = void 0;
|
|
4
|
+
exports.compareStrings = compareStrings;
|
|
4
5
|
exports.parseEnv = parseEnv;
|
|
5
6
|
exports.serializeEnv = serializeEnv;
|
|
6
7
|
exports.envValues = envValues;
|
|
7
8
|
exports.removeEnvKeys = removeEnvKeys;
|
|
8
9
|
exports.upsertEnvSection = upsertEnvSection;
|
|
9
10
|
exports.pruneEmptySections = pruneEmptySections;
|
|
11
|
+
exports.normalizeSections = normalizeSections;
|
|
10
12
|
exports.replaceMarkedBlock = replaceMarkedBlock;
|
|
11
13
|
const SINGLE_ENTRY_RE = /^\s*(?:export\s+)?([\w.-]+)\s*=\s*([\s\S]*?)\s*$/;
|
|
12
14
|
const SECTION_TITLE_RE = /^# ! (.+) variables\s*$/;
|
|
13
15
|
const DECORATION_RE = /^#\s*-{5,}\s*$/;
|
|
16
|
+
function compareStrings(a, b) {
|
|
17
|
+
return a < b ? -1 : a > b ? 1 : 0;
|
|
18
|
+
}
|
|
14
19
|
function parseEnv(content) {
|
|
15
20
|
const normalized = content.replace(/\r\n?/g, "\n");
|
|
16
21
|
const rawLines = normalized.split("\n");
|
|
@@ -165,6 +170,53 @@ function pruneEmptySections(lines) {
|
|
|
165
170
|
}
|
|
166
171
|
exports.MODULES_MARKER_START = "# @@newbie-modules-start";
|
|
167
172
|
exports.MODULES_MARKER_END = "# @@newbie-modules-end";
|
|
173
|
+
function normalizeSections(lines) {
|
|
174
|
+
const spans = [];
|
|
175
|
+
for (let i = 0; i < lines.length; i++) {
|
|
176
|
+
const line = lines[i];
|
|
177
|
+
if (line.kind !== "comment")
|
|
178
|
+
continue;
|
|
179
|
+
const match = line.text.match(SECTION_TITLE_RE);
|
|
180
|
+
if (!match)
|
|
181
|
+
continue;
|
|
182
|
+
let start = i;
|
|
183
|
+
if (lines[start - 1]?.kind === "comment" && DECORATION_RE.test(lines[start - 1].text)) {
|
|
184
|
+
start -= 1;
|
|
185
|
+
if (lines[start - 1]?.kind === "blank")
|
|
186
|
+
start -= 1;
|
|
187
|
+
}
|
|
188
|
+
const entries = [];
|
|
189
|
+
let j = i + 1;
|
|
190
|
+
if (lines[j]?.kind === "comment" && DECORATION_RE.test(lines[j].text))
|
|
191
|
+
j += 1;
|
|
192
|
+
while (j < lines.length) {
|
|
193
|
+
const candidate = lines[j];
|
|
194
|
+
if (candidate.kind !== "entry")
|
|
195
|
+
break;
|
|
196
|
+
entries.push(candidate);
|
|
197
|
+
j += 1;
|
|
198
|
+
}
|
|
199
|
+
spans.push({ title: match[1], start, end: j, entries });
|
|
200
|
+
i = j - 1;
|
|
201
|
+
}
|
|
202
|
+
if (spans.length === 0)
|
|
203
|
+
return lines;
|
|
204
|
+
const documentOrder = spans;
|
|
205
|
+
const sorted = [...spans].sort((a, b) => compareStrings(a.title, b.title));
|
|
206
|
+
const next = [];
|
|
207
|
+
for (let i = 0; i < lines.length; i++) {
|
|
208
|
+
if (i === documentOrder[0].start) {
|
|
209
|
+
for (const span of sorted) {
|
|
210
|
+
next.push(...sectionHeader(span.title));
|
|
211
|
+
next.push(...[...span.entries].sort((a, b) => compareStrings(a.key, b.key)));
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
if (documentOrder.some((span) => i >= span.start && i < span.end))
|
|
215
|
+
continue;
|
|
216
|
+
next.push(lines[i]);
|
|
217
|
+
}
|
|
218
|
+
return next;
|
|
219
|
+
}
|
|
168
220
|
function replaceMarkedBlock(content, body) {
|
|
169
221
|
const startIndex = content.indexOf(exports.MODULES_MARKER_START);
|
|
170
222
|
const endIndex = content.indexOf(exports.MODULES_MARKER_END);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-file.js","sourceRoot":"","sources":["../../src/core/env-file.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"env-file.js","sourceRoot":"","sources":["../../src/core/env-file.ts"],"names":[],"mappings":"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"}
|