swallowkit 1.0.0-beta.28 → 1.0.0-beta.29
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/core/config.d.ts.map +1 -1
- package/dist/core/config.js +4 -1
- package/dist/core/config.js.map +1 -1
- package/dist/core/project/validation.d.ts.map +1 -1
- package/dist/core/project/validation.js +7 -2
- package/dist/core/project/validation.js.map +1 -1
- package/package.json +1 -1
- package/src/__tests__/config.test.ts +13 -2
- package/src/__tests__/machine.test.ts +39 -0
- package/src/core/config.ts +5 -1
- package/src/core/project/validation.ts +10 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiC9F;;GAEG;AACH,wBAAgB,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAiChE;AA8BD;;GAEG;AACH,wBAAgB,cAAc,CAAC,UAAU,GAAE,MAAiC,GAAG,IAAI,CAqBlF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAkC7D;AAED,wBAAgB,kBAAkB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,eAAe,CAOvE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAKnE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAGlH;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAGzE;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiC9F;;GAEG;AACH,wBAAgB,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAiChE;AA8BD;;GAEG;AACH,wBAAgB,cAAc,CAAC,UAAU,GAAE,MAAiC,GAAG,IAAI,CAqBlF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAkC7D;AAED,wBAAgB,kBAAkB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,eAAe,CAOvE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAKnE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAGlH;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAGzE;AAaD,wBAAgB,cAAc,CAAC,MAAM,EAAE,gBAAgB,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAiD7F;AAWD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAYjE;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAavF"}
|
package/dist/core/config.js
CHANGED
|
@@ -224,10 +224,13 @@ function getAuthConfig(configPath) {
|
|
|
224
224
|
const VALID_CONNECTOR_TYPES = ["rdb", "api"];
|
|
225
225
|
const VALID_RDB_PROVIDERS = ["mysql", "postgres", "sqlserver"];
|
|
226
226
|
const VALID_API_AUTH_TYPES = ["apiKey", "bearer", "oauth2"];
|
|
227
|
+
function hasConfiguredDatabase(config) {
|
|
228
|
+
return Boolean(config.database && Object.keys(config.database).length > 0);
|
|
229
|
+
}
|
|
227
230
|
function validateConfig(config) {
|
|
228
231
|
const errors = [];
|
|
229
232
|
// データベース設定の検証
|
|
230
|
-
if (config
|
|
233
|
+
if (hasConfiguredDatabase(config) && !config.database?.connectionString) {
|
|
231
234
|
errors.push("Cosmos DB connection string is required");
|
|
232
235
|
}
|
|
233
236
|
// API設定の検証
|
package/dist/core/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuCA,gCAiCC;AAiCD,wCAqBC;AAKD,8CAkCC;AAED,gDAOC;AAKD,sCAKC;AAKD,wDAGC;AAKD,sCAGC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/core/project/validation.ts"],"names":[],"mappings":"AAEA,OAAO,EAA6C,eAAe,EAAmD,MAAM,YAAY,CAAC;AAGzI,MAAM,MAAM,wBAAwB,GAAG,OAAO,GAAG,SAAS,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,wBAAwB,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE;QACT,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,eAAe,CAAC;IAC1B,cAAc,EAAE,MAAM,GAAG,eAAe,CAAC;IACzC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,EAAE,gBAAgB,EAAE,CAAC;CAChC;
|
|
1
|
+
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/core/project/validation.ts"],"names":[],"mappings":"AAEA,OAAO,EAA6C,eAAe,EAAmD,MAAM,YAAY,CAAC;AAGzI,MAAM,MAAM,wBAAwB,GAAG,OAAO,GAAG,SAAS,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,wBAAwB,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE;QACT,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,eAAe,CAAC;IAC1B,cAAc,EAAE,MAAM,GAAG,eAAe,CAAC;IACzC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,EAAE,gBAAgB,EAAE,CAAC;CAChC;AA2KD,wBAAsB,eAAe,CAAC,WAAW,GAAE,MAAsB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAkC3G"}
|
|
@@ -41,6 +41,9 @@ const model_parser_1 = require("../scaffold/model-parser");
|
|
|
41
41
|
function pushViolation(violations, violation) {
|
|
42
42
|
violations.push(violation);
|
|
43
43
|
}
|
|
44
|
+
function hasScaffoldedEntities(manifest) {
|
|
45
|
+
return manifest.entities.length > 0;
|
|
46
|
+
}
|
|
44
47
|
function validateRequiredPaths(manifest, violations) {
|
|
45
48
|
const requiredModules = manifest.modules.filter((module) => ["shared-models", "bff", "functions"].includes(module.kind));
|
|
46
49
|
for (const module of requiredModules) {
|
|
@@ -54,7 +57,7 @@ function validateRequiredPaths(manifest, violations) {
|
|
|
54
57
|
});
|
|
55
58
|
}
|
|
56
59
|
}
|
|
57
|
-
if (!manifest.artifacts.callFunctionHelperExists) {
|
|
60
|
+
if (hasScaffoldedEntities(manifest) && !manifest.artifacts.callFunctionHelperExists) {
|
|
58
61
|
pushViolation(violations, {
|
|
59
62
|
code: "missing-call-function-helper",
|
|
60
63
|
severity: "warning",
|
|
@@ -101,7 +104,9 @@ function validateGeneratedArtifacts(manifest, violations) {
|
|
|
101
104
|
});
|
|
102
105
|
}
|
|
103
106
|
}
|
|
104
|
-
if (manifest
|
|
107
|
+
if (hasScaffoldedEntities(manifest) &&
|
|
108
|
+
manifest.backendLanguage !== "typescript" &&
|
|
109
|
+
manifest.artifacts.openApiSpecs.length === 0) {
|
|
105
110
|
pushViolation(violations, {
|
|
106
111
|
code: "missing-openapi-artifacts",
|
|
107
112
|
severity: "warning",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/core/project/validation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/core/project/validation.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -13,13 +13,24 @@ describe("validateConfig", () => {
|
|
|
13
13
|
expect(result.errors).toHaveLength(0);
|
|
14
14
|
});
|
|
15
15
|
|
|
16
|
-
it("
|
|
16
|
+
it("accepts an empty database object", () => {
|
|
17
17
|
const config: SwallowKitConfig = {
|
|
18
18
|
database: {},
|
|
19
19
|
backend: { language: "typescript" },
|
|
20
20
|
api: { endpoint: "/api/_swallowkit" },
|
|
21
21
|
};
|
|
22
22
|
const result = validateConfig(config);
|
|
23
|
+
expect(result.valid).toBe(true);
|
|
24
|
+
expect(result.errors).not.toContain("Cosmos DB connection string is required");
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
it("returns error when database settings are incomplete", () => {
|
|
28
|
+
const config: SwallowKitConfig = {
|
|
29
|
+
database: { databaseName: "SwallowKitDB" },
|
|
30
|
+
backend: { language: "typescript" },
|
|
31
|
+
api: { endpoint: "/api/_swallowkit" },
|
|
32
|
+
};
|
|
33
|
+
const result = validateConfig(config);
|
|
23
34
|
expect(result.valid).toBe(false);
|
|
24
35
|
expect(result.errors).toContain("Cosmos DB connection string is required");
|
|
25
36
|
});
|
|
@@ -37,7 +48,7 @@ describe("validateConfig", () => {
|
|
|
37
48
|
|
|
38
49
|
it("returns multiple errors for multiple issues", () => {
|
|
39
50
|
const config: SwallowKitConfig = {
|
|
40
|
-
database: {},
|
|
51
|
+
database: { databaseName: "SwallowKitDB" },
|
|
41
52
|
backend: { language: "typescript" },
|
|
42
53
|
api: { endpoint: "bad-endpoint" },
|
|
43
54
|
};
|
|
@@ -68,6 +68,32 @@ function createProjectFixture(rootDir: string, options: { includeGeneratedArtifa
|
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
+
function createFreshInitProjectFixture(rootDir: string, backendLanguage: "csharp" | "python" = "csharp"): void {
|
|
72
|
+
writeFile(path.join(rootDir, "package.json"), JSON.stringify({ name: "sample-app" }, null, 2));
|
|
73
|
+
writeFile(
|
|
74
|
+
path.join(rootDir, "swallowkit.config.js"),
|
|
75
|
+
`module.exports = {
|
|
76
|
+
backend: {
|
|
77
|
+
language: '${backendLanguage}',
|
|
78
|
+
},
|
|
79
|
+
functions: {
|
|
80
|
+
baseUrl: process.env.BACKEND_FUNCTIONS_BASE_URL || process.env.FUNCTIONS_BASE_URL || 'http://localhost:7071',
|
|
81
|
+
},
|
|
82
|
+
deployment: {
|
|
83
|
+
resourceGroup: process.env.AZURE_RESOURCE_GROUP || '',
|
|
84
|
+
swaName: process.env.AZURE_SWA_NAME || '',
|
|
85
|
+
},
|
|
86
|
+
};
|
|
87
|
+
`
|
|
88
|
+
);
|
|
89
|
+
writeFile(path.join(rootDir, "shared", "package.json"), JSON.stringify({ name: "@sample-app/shared" }, null, 2));
|
|
90
|
+
writeFile(path.join(rootDir, "shared", "index.ts"), "export {};\n");
|
|
91
|
+
fs.mkdirSync(path.join(rootDir, "shared", "models"), { recursive: true });
|
|
92
|
+
writeFile(path.join(rootDir, "app", "api", "greet", "route.ts"), "export async function GET() { return Response.json({}); }\n");
|
|
93
|
+
writeFile(path.join(rootDir, "lib", "api", "backend.ts"), "export const api = {};\n");
|
|
94
|
+
fs.mkdirSync(path.join(rootDir, "functions"), { recursive: true });
|
|
95
|
+
}
|
|
96
|
+
|
|
71
97
|
async function runMachine(argv: string[]): Promise<{ response: any; exitCode: number }> {
|
|
72
98
|
const writes: string[] = [];
|
|
73
99
|
const originalWrite = process.stdout.write.bind(process.stdout);
|
|
@@ -147,6 +173,19 @@ describe("machine CLI", () => {
|
|
|
147
173
|
);
|
|
148
174
|
});
|
|
149
175
|
|
|
176
|
+
it("does not report false positives for a fresh C# init project", async () => {
|
|
177
|
+
createFreshInitProjectFixture(tempDir, "csharp");
|
|
178
|
+
|
|
179
|
+
const { response, exitCode } = await runMachine(["node", "swallowkit", "machine", "validate", "project"]);
|
|
180
|
+
|
|
181
|
+
expect(exitCode).toBe(0);
|
|
182
|
+
expect(response.ok).toBe(true);
|
|
183
|
+
expect(response.command).toBe("validate-project");
|
|
184
|
+
expect(response.data.manifest.backendLanguage).toBe("csharp");
|
|
185
|
+
expect(response.data.manifest.configValidation.valid).toBe(true);
|
|
186
|
+
expect(response.data.violations).toEqual([]);
|
|
187
|
+
});
|
|
188
|
+
|
|
150
189
|
it("generates model templates through the machine interface", async () => {
|
|
151
190
|
writeFile(path.join(tempDir, "package.json"), JSON.stringify({ name: "sample-app" }, null, 2));
|
|
152
191
|
writeFile(
|
package/src/core/config.ts
CHANGED
|
@@ -207,11 +207,15 @@ const VALID_CONNECTOR_TYPES = ["rdb", "api"];
|
|
|
207
207
|
const VALID_RDB_PROVIDERS = ["mysql", "postgres", "sqlserver"];
|
|
208
208
|
const VALID_API_AUTH_TYPES = ["apiKey", "bearer", "oauth2"];
|
|
209
209
|
|
|
210
|
+
function hasConfiguredDatabase(config: SwallowKitConfig): boolean {
|
|
211
|
+
return Boolean(config.database && Object.keys(config.database).length > 0);
|
|
212
|
+
}
|
|
213
|
+
|
|
210
214
|
export function validateConfig(config: SwallowKitConfig): { valid: boolean; errors: string[] } {
|
|
211
215
|
const errors: string[] = [];
|
|
212
216
|
|
|
213
217
|
// データベース設定の検証
|
|
214
|
-
if (config
|
|
218
|
+
if (hasConfiguredDatabase(config) && !config.database?.connectionString) {
|
|
215
219
|
errors.push("Cosmos DB connection string is required");
|
|
216
220
|
}
|
|
217
221
|
|
|
@@ -30,6 +30,10 @@ function pushViolation(
|
|
|
30
30
|
violations.push(violation);
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
+
function hasScaffoldedEntities(manifest: ProjectManifest): boolean {
|
|
34
|
+
return manifest.entities.length > 0;
|
|
35
|
+
}
|
|
36
|
+
|
|
33
37
|
function validateRequiredPaths(manifest: ProjectManifest, violations: ProjectViolation[]): void {
|
|
34
38
|
const requiredModules = manifest.modules.filter((module) =>
|
|
35
39
|
["shared-models", "bff", "functions"].includes(module.kind)
|
|
@@ -47,7 +51,7 @@ function validateRequiredPaths(manifest: ProjectManifest, violations: ProjectVio
|
|
|
47
51
|
}
|
|
48
52
|
}
|
|
49
53
|
|
|
50
|
-
if (!manifest.artifacts.callFunctionHelperExists) {
|
|
54
|
+
if (hasScaffoldedEntities(manifest) && !manifest.artifacts.callFunctionHelperExists) {
|
|
51
55
|
pushViolation(violations, {
|
|
52
56
|
code: "missing-call-function-helper",
|
|
53
57
|
severity: "warning",
|
|
@@ -98,7 +102,11 @@ function validateGeneratedArtifacts(manifest: ProjectManifest, violations: Proje
|
|
|
98
102
|
}
|
|
99
103
|
}
|
|
100
104
|
|
|
101
|
-
if (
|
|
105
|
+
if (
|
|
106
|
+
hasScaffoldedEntities(manifest) &&
|
|
107
|
+
manifest.backendLanguage !== "typescript" &&
|
|
108
|
+
manifest.artifacts.openApiSpecs.length === 0
|
|
109
|
+
) {
|
|
102
110
|
pushViolation(violations, {
|
|
103
111
|
code: "missing-openapi-artifacts",
|
|
104
112
|
severity: "warning",
|