@devbie/newbie-cli 1.5.0 → 1.7.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/README.md +40 -21
- package/dist/assemble/deploy.d.ts +14 -0
- package/dist/assemble/deploy.js +77 -0
- package/dist/assemble/deploy.js.map +1 -0
- package/dist/assemble/modules-copy.js +1 -1
- package/dist/assemble/modules-copy.js.map +1 -1
- package/dist/assemble/pipeline.js +3 -3
- package/dist/assemble/pipeline.js.map +1 -1
- package/dist/commands/assemble.d.ts +5 -0
- package/dist/commands/assemble.js +37 -0
- package/dist/commands/assemble.js.map +1 -0
- package/dist/commands/update-template.js +53 -15
- package/dist/commands/update-template.js.map +1 -1
- package/dist/constants/paths.d.ts +2 -0
- package/dist/constants/paths.js +3 -1
- package/dist/constants/paths.js.map +1 -1
- package/dist/core/caddyfile-modules.d.ts +2 -0
- package/dist/core/caddyfile-modules.js +23 -0
- package/dist/core/caddyfile-modules.js.map +1 -0
- package/dist/core/datastore-registry.d.ts +30 -0
- package/dist/core/datastore-registry.js +86 -0
- package/dist/core/datastore-registry.js.map +1 -0
- package/dist/core/deploy-compose.d.ts +5 -0
- package/dist/core/deploy-compose.js +113 -0
- package/dist/core/deploy-compose.js.map +1 -0
- package/dist/core/layer-lint.d.ts +1 -1
- package/dist/core/layer-lint.js +15 -4
- package/dist/core/layer-lint.js.map +1 -1
- package/dist/core/module-manifest.d.ts +1 -2
- package/dist/core/module-manifest.js +8 -0
- package/dist/core/module-manifest.js.map +1 -1
- package/dist/core/template-sync.d.ts +32 -13
- package/dist/core/template-sync.js +177 -65
- package/dist/core/template-sync.js.map +1 -1
- package/dist/index.js +12 -3
- package/dist/index.js.map +1 -1
- package/dist/lib/drift.js +2 -2
- package/dist/lib/drift.js.map +1 -1
- package/dist/lib/version.js.map +1 -1
- package/package.json +1 -1
- package/dist/assemble/assets.d.ts +0 -9
- package/dist/assemble/assets.js +0 -49
- package/dist/assemble/assets.js.map +0 -1
- package/dist/core/assets.d.ts +0 -8
- package/dist/core/assets.js +0 -30
- package/dist/core/assets.js.map +0 -1
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DATASTORE_REGISTRY = void 0;
|
|
4
|
+
exports.isRegisteredDatastore = isRegisteredDatastore;
|
|
5
|
+
exports.DATASTORE_REGISTRY = {
|
|
6
|
+
mongo: {
|
|
7
|
+
service: {
|
|
8
|
+
image: "mongo:8",
|
|
9
|
+
restart: "unless-stopped",
|
|
10
|
+
command: ["mongod", "--wiredTigerCacheSizeGB", "2"],
|
|
11
|
+
envFile: true,
|
|
12
|
+
volumes: ["./data/mongo:/data/db"],
|
|
13
|
+
healthcheck: {
|
|
14
|
+
test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand('ping').ok"],
|
|
15
|
+
interval: "15s",
|
|
16
|
+
timeout: "5s",
|
|
17
|
+
retries: 5,
|
|
18
|
+
},
|
|
19
|
+
},
|
|
20
|
+
backupEngine: "mongodb",
|
|
21
|
+
},
|
|
22
|
+
redis: {
|
|
23
|
+
service: {
|
|
24
|
+
image: "redis:8-alpine",
|
|
25
|
+
restart: "unless-stopped",
|
|
26
|
+
command: ["redis-server", "--requirepass", "${REDIS_PASSWORD}", "--appendonly", "yes"],
|
|
27
|
+
volumes: ["./data/redis:/data"],
|
|
28
|
+
healthcheck: {
|
|
29
|
+
test: ["CMD", "redis-cli", "-a", "${REDIS_PASSWORD}", "ping"],
|
|
30
|
+
interval: "10s",
|
|
31
|
+
timeout: "5s",
|
|
32
|
+
retries: 5,
|
|
33
|
+
},
|
|
34
|
+
},
|
|
35
|
+
backupEngine: "redis",
|
|
36
|
+
},
|
|
37
|
+
clickhouse: {
|
|
38
|
+
service: {
|
|
39
|
+
image: "clickhouse/clickhouse-server:26.8-alpine",
|
|
40
|
+
restart: "unless-stopped",
|
|
41
|
+
environment: {
|
|
42
|
+
CLICKHOUSE_DB: "${CLICKHOUSE_DB}",
|
|
43
|
+
CLICKHOUSE_USER: "${CLICKHOUSE_USER}",
|
|
44
|
+
CLICKHOUSE_PASSWORD: "${CLICKHOUSE_PASSWORD}",
|
|
45
|
+
CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: "1",
|
|
46
|
+
},
|
|
47
|
+
ulimits: { nofile: { soft: "262144", hard: "262144" } },
|
|
48
|
+
volumes: [
|
|
49
|
+
"./data/clickhouse:/var/lib/clickhouse",
|
|
50
|
+
"./clickhouse/config.d/memory.xml:/etc/clickhouse-server/config.d/memory.xml:ro",
|
|
51
|
+
],
|
|
52
|
+
healthcheck: {
|
|
53
|
+
test: ["CMD", "wget", "--spider", "-q", "http://127.0.0.1:8123/ping"],
|
|
54
|
+
interval: "15s",
|
|
55
|
+
timeout: "5s",
|
|
56
|
+
retries: 5,
|
|
57
|
+
},
|
|
58
|
+
},
|
|
59
|
+
backupEngine: "clickhouse",
|
|
60
|
+
backupHelper: {
|
|
61
|
+
image: "altinity/clickhouse-backup:2.8.1",
|
|
62
|
+
profiles: ["backup"],
|
|
63
|
+
envFile: true,
|
|
64
|
+
environment: {
|
|
65
|
+
CLICKHOUSE_HOST: "clickhouse",
|
|
66
|
+
CLICKHOUSE_PORT: "9000",
|
|
67
|
+
CLICKHOUSE_USERNAME: "${CLICKHOUSE_USER}",
|
|
68
|
+
CLICKHOUSE_PASSWORD: "${CLICKHOUSE_PASSWORD}",
|
|
69
|
+
REMOTE_STORAGE: "s3",
|
|
70
|
+
S3_BUCKET: "${BACKUP_BUCKET}",
|
|
71
|
+
S3_PATH: "clickhouse",
|
|
72
|
+
S3_REGION: "${AWS_REGION}",
|
|
73
|
+
S3_ACL: "private",
|
|
74
|
+
LOG_LEVEL: "info",
|
|
75
|
+
},
|
|
76
|
+
volumes: ["./data/clickhouse:/var/lib/clickhouse"],
|
|
77
|
+
dependsOn: { clickhouse: { condition: "service_healthy" } },
|
|
78
|
+
},
|
|
79
|
+
},
|
|
80
|
+
elasticsearch: { service: null, backupEngine: null },
|
|
81
|
+
snowflake: { service: null, backupEngine: null },
|
|
82
|
+
};
|
|
83
|
+
function isRegisteredDatastore(key) {
|
|
84
|
+
return key in exports.DATASTORE_REGISTRY;
|
|
85
|
+
}
|
|
86
|
+
//# sourceMappingURL=datastore-registry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"datastore-registry.js","sourceRoot":"","sources":["../../src/core/datastore-registry.ts"],"names":[],"mappings":";;;AAmJA,sDAEC;AA9FY,QAAA,kBAAkB,GAAkD;IAC/E,KAAK,EAAE;QACL,OAAO,EAAE;YACP,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,gBAAgB;YAGzB,OAAO,EAAE,CAAC,QAAQ,EAAE,yBAAyB,EAAE,GAAG,CAAC;YACnD,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,CAAC,uBAAuB,CAAC;YAClC,WAAW,EAAE;gBACX,IAAI,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,4BAA4B,CAAC;gBAC3E,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,CAAC;aACX;SACF;QACD,YAAY,EAAE,SAAS;KACxB;IAED,KAAK,EAAE;QACL,OAAO,EAAE;YACP,KAAK,EAAE,gBAAgB;YACvB,OAAO,EAAE,gBAAgB;YAGzB,OAAO,EAAE,CAAC,cAAc,EAAE,eAAe,EAAE,mBAAmB,EAAE,cAAc,EAAE,KAAK,CAAC;YACtF,OAAO,EAAE,CAAC,oBAAoB,CAAC;YAC/B,WAAW,EAAE;gBACX,IAAI,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,CAAC;gBAC7D,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,CAAC;aACX;SACF;QACD,YAAY,EAAE,OAAO;KACtB;IAED,UAAU,EAAE;QACV,OAAO,EAAE;YACP,KAAK,EAAE,0CAA0C;YACjD,OAAO,EAAE,gBAAgB;YACzB,WAAW,EAAE;gBACX,aAAa,EAAE,kBAAkB;gBACjC,eAAe,EAAE,oBAAoB;gBACrC,mBAAmB,EAAE,wBAAwB;gBAC7C,oCAAoC,EAAE,GAAG;aAC1C;YACD,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;YACvD,OAAO,EAAE;gBACP,uCAAuC;gBAEvC,gFAAgF;aACjF;YACD,WAAW,EAAE;gBACX,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,4BAA4B,CAAC;gBACrE,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,CAAC;aACX;SACF;QACD,YAAY,EAAE,YAAY;QAC1B,YAAY,EAAE;YAGZ,KAAK,EAAE,kCAAkC;YACzC,QAAQ,EAAE,CAAC,QAAQ,CAAC;YACpB,OAAO,EAAE,IAAI;YACb,WAAW,EAAE;gBACX,eAAe,EAAE,YAAY;gBAE7B,eAAe,EAAE,MAAM;gBACvB,mBAAmB,EAAE,oBAAoB;gBACzC,mBAAmB,EAAE,wBAAwB;gBAC7C,cAAc,EAAE,IAAI;gBACpB,SAAS,EAAE,kBAAkB;gBAC7B,OAAO,EAAE,YAAY;gBACrB,SAAS,EAAE,eAAe;gBAC1B,MAAM,EAAE,SAAS;gBACjB,SAAS,EAAE,MAAM;aAClB;YACD,OAAO,EAAE,CAAC,uCAAuC,CAAC;YAClD,SAAS,EAAE,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,EAAE;SAC5D;KACF;IAID,aAAa,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE;IACpD,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE;CACjD,CAAC;AAEF,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,OAAO,GAAG,IAAI,0BAAkB,CAAC;AACnC,CAAC"}
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.buildComposeModulesYaml = buildComposeModulesYaml;
|
|
4
|
+
const env_file_1 = require("./env-file");
|
|
5
|
+
const datastore_registry_1 = require("./datastore-registry");
|
|
6
|
+
const HEADER = `# THIS FILE IS GENERATED BY @devbie/newbie-cli. DO NOT EDIT.
|
|
7
|
+
# Regenerate with \`newbie assemble\` (it also runs as part of install/apply/update).
|
|
8
|
+
|
|
9
|
+
`;
|
|
10
|
+
const EMPTY_YAML = `${HEADER}services: {}\n`;
|
|
11
|
+
function quote(value) {
|
|
12
|
+
return JSON.stringify(value);
|
|
13
|
+
}
|
|
14
|
+
function emitKey(key) {
|
|
15
|
+
return /^[A-Za-z0-9_-]+$/.test(key) ? key : quote(key);
|
|
16
|
+
}
|
|
17
|
+
function flowList(items) {
|
|
18
|
+
return `[${items.map(quote).join(", ")}]`;
|
|
19
|
+
}
|
|
20
|
+
function blockList(indent, items) {
|
|
21
|
+
return items.map((item) => `${indent}- ${quote(item)}`);
|
|
22
|
+
}
|
|
23
|
+
function emitService(name, spec, labels) {
|
|
24
|
+
const lines = [` ${name}:`];
|
|
25
|
+
lines.push(` image: ${quote(spec.image)}`);
|
|
26
|
+
if (spec.restart)
|
|
27
|
+
lines.push(` restart: ${quote(spec.restart)}`);
|
|
28
|
+
if (spec.command)
|
|
29
|
+
lines.push(` command: ${flowList(spec.command)}`);
|
|
30
|
+
if (spec.profiles)
|
|
31
|
+
lines.push(` profiles: ${flowList(spec.profiles)}`);
|
|
32
|
+
if (spec.envFile)
|
|
33
|
+
lines.push(` env_file:`, ` - "./.env"`);
|
|
34
|
+
if (spec.environment) {
|
|
35
|
+
lines.push(` environment:`);
|
|
36
|
+
for (const [key, value] of Object.entries(spec.environment)) {
|
|
37
|
+
lines.push(` ${emitKey(key)}: ${quote(value)}`);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
if (spec.ulimits) {
|
|
41
|
+
lines.push(` ulimits:`);
|
|
42
|
+
for (const [key, value] of Object.entries(spec.ulimits)) {
|
|
43
|
+
lines.push(` ${emitKey(key)}:`, ` soft: ${quote(value.soft)}`, ` hard: ${quote(value.hard)}`);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
if (spec.volumes)
|
|
47
|
+
lines.push(` volumes:`, ...blockList(" ", spec.volumes));
|
|
48
|
+
lines.push(` networks:`, ` - "nwb"`);
|
|
49
|
+
if (labels) {
|
|
50
|
+
lines.push(` labels:`);
|
|
51
|
+
for (const [key, value] of Object.entries(labels)) {
|
|
52
|
+
lines.push(` ${emitKey(key)}: ${quote(value)}`);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
if (spec.healthcheck) {
|
|
56
|
+
const healthcheck = spec.healthcheck;
|
|
57
|
+
lines.push(` healthcheck:`, ` test: ${flowList(healthcheck.test)}`, ` interval: ${quote(healthcheck.interval)}`, ` timeout: ${quote(healthcheck.timeout)}`, ` retries: ${healthcheck.retries}`);
|
|
58
|
+
}
|
|
59
|
+
if (spec.dependsOn) {
|
|
60
|
+
lines.push(` depends_on:`);
|
|
61
|
+
for (const [key, value] of Object.entries(spec.dependsOn)) {
|
|
62
|
+
lines.push(` ${emitKey(key)}:`, ` condition: ${quote(value.condition)}`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
return lines;
|
|
66
|
+
}
|
|
67
|
+
function migratorSpec(key) {
|
|
68
|
+
return {
|
|
69
|
+
image: "${ECR_REPOSITORY_PREFIX}/${APP_NAME}-backend:${IMAGE_TAG}",
|
|
70
|
+
restart: "no",
|
|
71
|
+
envFile: true,
|
|
72
|
+
command: ["node", `dist/src/modules/${key}/migration/migrate-cli.js`, "deploy"],
|
|
73
|
+
dependsOn: { [key]: { condition: "service_healthy" } },
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
function buildComposeModulesYaml(datastores) {
|
|
77
|
+
for (const { key } of datastores) {
|
|
78
|
+
if (!(0, datastore_registry_1.isRegisteredDatastore)(key)) {
|
|
79
|
+
throw new Error(`compose.modules.yml renderer: '${key}' is not listed in the datastore registry`);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
const sorted = [...datastores].sort((a, b) => (0, env_file_1.compareStrings)(a.key, b.key));
|
|
83
|
+
const serviceLines = [];
|
|
84
|
+
const healthyServices = [];
|
|
85
|
+
const migratorServices = [];
|
|
86
|
+
for (const { key, hasMigrator } of sorted) {
|
|
87
|
+
const definition = datastore_registry_1.DATASTORE_REGISTRY[key];
|
|
88
|
+
if (!definition.service)
|
|
89
|
+
continue;
|
|
90
|
+
const labels = definition.backupEngine ? { "newbie.backup-engine": definition.backupEngine } : undefined;
|
|
91
|
+
serviceLines.push(...emitService(key, definition.service, labels));
|
|
92
|
+
healthyServices.push(key);
|
|
93
|
+
if (definition.backupHelper) {
|
|
94
|
+
serviceLines.push(...emitService(`${key}-backup`, definition.backupHelper));
|
|
95
|
+
}
|
|
96
|
+
if (hasMigrator) {
|
|
97
|
+
serviceLines.push(...emitService(`${key}-migrate`, migratorSpec(key)));
|
|
98
|
+
migratorServices.push(`${key}-migrate`);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
if (serviceLines.length === 0)
|
|
102
|
+
return EMPTY_YAML;
|
|
103
|
+
const lines = [`${HEADER}services:`, ...serviceLines];
|
|
104
|
+
lines.push(" backend:", " depends_on:");
|
|
105
|
+
for (const service of migratorServices) {
|
|
106
|
+
lines.push(` ${service}:`, ` condition: "service_completed_successfully"`);
|
|
107
|
+
}
|
|
108
|
+
for (const service of healthyServices) {
|
|
109
|
+
lines.push(` ${service}:`, ` condition: "service_healthy"`);
|
|
110
|
+
}
|
|
111
|
+
return `${lines.join("\n")}\n`;
|
|
112
|
+
}
|
|
113
|
+
//# sourceMappingURL=deploy-compose.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deploy-compose.js","sourceRoot":"","sources":["../../src/core/deploy-compose.ts"],"names":[],"mappings":"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"}
|
package/dist/core/layer-lint.js
CHANGED
|
@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.MODULE_LAYERS = void 0;
|
|
4
4
|
exports.isModuleLayer = isModuleLayer;
|
|
5
5
|
exports.lintModuleLayers = lintModuleLayers;
|
|
6
|
-
|
|
6
|
+
const datastore_registry_1 = require("./datastore-registry");
|
|
7
|
+
exports.MODULE_LAYERS = ["datastore", "infrastructure", "capability", "feature"];
|
|
7
8
|
const LAYER_RANK = {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
datastore: 10,
|
|
10
|
+
infrastructure: 20,
|
|
11
|
+
capability: 30,
|
|
12
|
+
feature: 40,
|
|
11
13
|
};
|
|
12
14
|
function isModuleLayer(value) {
|
|
13
15
|
return exports.MODULE_LAYERS.includes(value);
|
|
@@ -63,6 +65,15 @@ function lintModuleLayers(modules) {
|
|
|
63
65
|
});
|
|
64
66
|
}
|
|
65
67
|
}
|
|
68
|
+
for (const mod of modules) {
|
|
69
|
+
if (mod.layer === "datastore" && !(0, datastore_registry_1.isRegisteredDatastore)(mod.key)) {
|
|
70
|
+
findings.push({
|
|
71
|
+
level: "error",
|
|
72
|
+
module: mod.key,
|
|
73
|
+
message: `datastore module '${mod.key}' is not listed in the CLI datastore registry`,
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
}
|
|
66
77
|
for (const mod of modules) {
|
|
67
78
|
const declared = mod.declaredDependencies ?? mod.dependencies;
|
|
68
79
|
const edges = [...new Set([...mod.dependencies, ...declared])];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layer-lint.js","sourceRoot":"","sources":["../../src/core/layer-lint.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"layer-lint.js","sourceRoot":"","sources":["../../src/core/layer-lint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { NestAsset } from "./assets";
|
|
2
1
|
export type ModuleRole = "collector";
|
|
3
2
|
export declare const MODULE_ROLES: readonly ModuleRole[];
|
|
4
3
|
export declare function isModuleRole(value: string): value is ModuleRole;
|
|
@@ -10,6 +9,7 @@ export interface ModuleManifest {
|
|
|
10
9
|
key: string;
|
|
11
10
|
layer?: string;
|
|
12
11
|
role?: ModuleRole;
|
|
12
|
+
publicNamespace?: boolean;
|
|
13
13
|
module: ModuleWiring;
|
|
14
14
|
schema?: string;
|
|
15
15
|
"config-service"?: Record<string, unknown>;
|
|
@@ -17,7 +17,6 @@ export interface ModuleManifest {
|
|
|
17
17
|
dependencies?: Record<string, string>;
|
|
18
18
|
devDependencies?: Record<string, string>;
|
|
19
19
|
moduleDependencies?: string[];
|
|
20
|
-
assets?: NestAsset[];
|
|
21
20
|
cli?: string;
|
|
22
21
|
sdk?: string;
|
|
23
22
|
deprecated?: string;
|
|
@@ -31,6 +31,13 @@ function assertOptionalRole(value, key) {
|
|
|
31
31
|
throw new Error(`Invalid newbie.module.json for '${key}': 'role' must be one of: ${exports.MODULE_ROLES.join(", ")} when declared.`);
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
|
+
function assertOptionalBoolean(value, field, key) {
|
|
35
|
+
if (value === undefined)
|
|
36
|
+
return;
|
|
37
|
+
if (typeof value !== "boolean") {
|
|
38
|
+
throw new Error(`Invalid newbie.module.json for '${key}': '${field}' must be a boolean when declared.`);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
34
41
|
function normalizeModuleManifest(raw, expectedKey) {
|
|
35
42
|
if (!raw || typeof raw !== "object") {
|
|
36
43
|
throw new Error("Invalid newbie.module.json: expected an object.");
|
|
@@ -55,6 +62,7 @@ function normalizeModuleManifest(raw, expectedKey) {
|
|
|
55
62
|
assertOptionalString(data.sdk, "sdk", data.key);
|
|
56
63
|
assertOptionalString(data.deprecated, "deprecated", data.key);
|
|
57
64
|
assertOptionalRole(data.role, data.key);
|
|
65
|
+
assertOptionalBoolean(data.publicNamespace, "publicNamespace", data.key);
|
|
58
66
|
const manifest = {
|
|
59
67
|
...data,
|
|
60
68
|
key: data.key,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-manifest.js","sourceRoot":"","sources":["../../src/core/module-manifest.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"module-manifest.js","sourceRoot":"","sources":["../../src/core/module-manifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,38 @@
|
|
|
1
|
-
export
|
|
2
|
-
export
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
export type MarkerSyntax = "//" | "#";
|
|
2
|
+
export interface FrameworkMarkers {
|
|
3
|
+
start: string;
|
|
4
|
+
end: string;
|
|
5
|
+
}
|
|
6
|
+
export declare function frameworkMarkers(syntax?: MarkerSyntax): FrameworkMarkers;
|
|
7
|
+
export type TemplateFileOwnership = "framework-whole-file" | "framework-marker-block" | "generated" | "template-shipped-host-owned";
|
|
8
|
+
export type RenderedFragment = {
|
|
9
|
+
kind: "line";
|
|
10
|
+
pattern: RegExp;
|
|
11
|
+
} | {
|
|
12
|
+
kind: "block";
|
|
13
|
+
start: string;
|
|
14
|
+
end: string;
|
|
15
|
+
};
|
|
16
|
+
export interface TemplateFile {
|
|
5
17
|
path: string;
|
|
6
|
-
|
|
18
|
+
ownership: TemplateFileOwnership;
|
|
19
|
+
markerSyntax?: MarkerSyntax;
|
|
20
|
+
rendered?: RenderedFragment;
|
|
7
21
|
}
|
|
8
|
-
export declare const
|
|
9
|
-
export declare function
|
|
10
|
-
export declare
|
|
11
|
-
export
|
|
12
|
-
export
|
|
13
|
-
|
|
14
|
-
|
|
22
|
+
export declare const TEMPLATE_FILES: readonly TemplateFile[];
|
|
23
|
+
export declare function isSyncableTemplateFile(file: TemplateFile): boolean;
|
|
24
|
+
export declare const TEMPLATE_SCAN_IGNORED_DIRECTORIES: ReadonlySet<string>;
|
|
25
|
+
export declare const TEMPLATE_SCAN_IGNORED_FILES: ReadonlySet<string>;
|
|
26
|
+
export declare const TEMPLATE_SCAN_IGNORED_SUFFIXES: readonly string[];
|
|
27
|
+
export declare function findUnclassifiedTemplateFiles(paths: Iterable<string>): string[];
|
|
28
|
+
export declare function extractMarkerBlock(content: string, syntax?: MarkerSyntax): string | null;
|
|
29
|
+
export declare function replaceMarkerBlock(content: string, block: string, syntax?: MarkerSyntax): string | null;
|
|
30
|
+
export type TemplateChangeKind = "create" | "update" | "missing-markers";
|
|
31
|
+
export interface TemplateChange {
|
|
32
|
+
file: TemplateFile;
|
|
33
|
+
kind: TemplateChangeKind;
|
|
15
34
|
nextContent: string | null;
|
|
16
35
|
currentComparable: string | null;
|
|
17
36
|
templateComparable: string | null;
|
|
18
37
|
}
|
|
19
|
-
export declare function planTemplateSync(projectFiles: ReadonlyMap<string, string | null>, templateFiles: ReadonlyMap<string, string | null
|
|
38
|
+
export declare function planTemplateSync(projectFiles: ReadonlyMap<string, string | null>, templateFiles: ReadonlyMap<string, string | null>, files?: readonly TemplateFile[]): TemplateChange[];
|