@zenstackhq/testtools 3.0.0-alpha.9 → 3.0.0-beta.2
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/index.cjs +32 -11
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +6 -2
- package/dist/index.d.ts +6 -2
- package/dist/index.js +30 -10
- package/dist/index.js.map +1 -1
- package/package.json +10 -9
package/dist/index.cjs
CHANGED
|
@@ -33,7 +33,8 @@ var src_exports = {};
|
|
|
33
33
|
__export(src_exports, {
|
|
34
34
|
createTestProject: () => createTestProject,
|
|
35
35
|
generateTsSchema: () => generateTsSchema,
|
|
36
|
-
generateTsSchemaFromFile: () => generateTsSchemaFromFile
|
|
36
|
+
generateTsSchemaFromFile: () => generateTsSchemaFromFile,
|
|
37
|
+
generateTsSchemaInPlace: () => generateTsSchemaInPlace
|
|
37
38
|
});
|
|
38
39
|
module.exports = __toCommonJS(src_exports);
|
|
39
40
|
|
|
@@ -86,42 +87,45 @@ function createTestProject() {
|
|
|
86
87
|
__name(createTestProject, "createTestProject");
|
|
87
88
|
|
|
88
89
|
// src/schema.ts
|
|
90
|
+
var import_language = require("@zenstackhq/language");
|
|
89
91
|
var import_sdk = require("@zenstackhq/sdk");
|
|
90
92
|
var import_glob = require("glob");
|
|
91
93
|
var import_node_child_process = require("child_process");
|
|
92
94
|
var import_node_fs2 = __toESM(require("fs"), 1);
|
|
93
95
|
var import_node_path2 = __toESM(require("path"), 1);
|
|
94
96
|
var import_ts_pattern = require("ts-pattern");
|
|
95
|
-
function makePrelude(provider,
|
|
97
|
+
function makePrelude(provider, dbUrl) {
|
|
96
98
|
return (0, import_ts_pattern.match)(provider).with("sqlite", () => {
|
|
97
99
|
return `
|
|
98
100
|
datasource db {
|
|
99
101
|
provider = 'sqlite'
|
|
100
|
-
url = '${
|
|
102
|
+
url = '${dbUrl ?? "file:./test.db"}'
|
|
101
103
|
}
|
|
102
104
|
`;
|
|
103
105
|
}).with("postgresql", () => {
|
|
104
106
|
return `
|
|
105
107
|
datasource db {
|
|
106
108
|
provider = 'postgresql'
|
|
107
|
-
url = 'postgres://postgres:postgres@localhost:5432
|
|
109
|
+
url = '${dbUrl ?? "postgres://postgres:postgres@localhost:5432/db"}'
|
|
108
110
|
}
|
|
109
111
|
`;
|
|
110
112
|
}).exhaustive();
|
|
111
113
|
}
|
|
112
114
|
__name(makePrelude, "makePrelude");
|
|
113
|
-
async function generateTsSchema(schemaText, provider = "sqlite",
|
|
115
|
+
async function generateTsSchema(schemaText, provider = "sqlite", dbUrl, extraSourceFiles) {
|
|
114
116
|
const workDir = createTestProject();
|
|
115
|
-
console.log(`Work directory: ${workDir}`);
|
|
116
117
|
const zmodelPath = import_node_path2.default.join(workDir, "schema.zmodel");
|
|
117
118
|
const noPrelude = schemaText.includes("datasource ");
|
|
118
|
-
import_node_fs2.default.writeFileSync(zmodelPath, `${noPrelude ? "" : makePrelude(provider,
|
|
119
|
+
import_node_fs2.default.writeFileSync(zmodelPath, `${noPrelude ? "" : makePrelude(provider, dbUrl)}
|
|
119
120
|
|
|
120
121
|
${schemaText}`);
|
|
121
122
|
const pluginModelFiles = import_glob.glob.sync(import_node_path2.default.resolve(__dirname, "../../runtime/src/plugins/**/plugin.zmodel"));
|
|
123
|
+
const result = await (0, import_language.loadDocument)(zmodelPath, pluginModelFiles);
|
|
124
|
+
if (!result.success) {
|
|
125
|
+
throw new Error(`Failed to load schema from ${zmodelPath}: ${result.errors}`);
|
|
126
|
+
}
|
|
122
127
|
const generator = new import_sdk.TsSchemaGenerator();
|
|
123
|
-
|
|
124
|
-
await generator.generate(zmodelPath, pluginModelFiles, tsPath);
|
|
128
|
+
await generator.generate(result.model, workDir);
|
|
125
129
|
if (extraSourceFiles) {
|
|
126
130
|
for (const [fileName, content] of Object.entries(extraSourceFiles)) {
|
|
127
131
|
const filePath = import_node_path2.default.resolve(workDir, `${fileName}.ts`);
|
|
@@ -131,6 +135,10 @@ ${schemaText}`);
|
|
|
131
135
|
import_node_fs2.default.writeFileSync(filePath, content);
|
|
132
136
|
}
|
|
133
137
|
}
|
|
138
|
+
return compileAndLoad(workDir);
|
|
139
|
+
}
|
|
140
|
+
__name(generateTsSchema, "generateTsSchema");
|
|
141
|
+
async function compileAndLoad(workDir) {
|
|
134
142
|
(0, import_node_child_process.execSync)("npx tsc", {
|
|
135
143
|
cwd: workDir,
|
|
136
144
|
stdio: "inherit"
|
|
@@ -141,16 +149,29 @@ ${schemaText}`);
|
|
|
141
149
|
schema: module2.schema
|
|
142
150
|
};
|
|
143
151
|
}
|
|
144
|
-
__name(
|
|
152
|
+
__name(compileAndLoad, "compileAndLoad");
|
|
145
153
|
function generateTsSchemaFromFile(filePath) {
|
|
146
154
|
const schemaText = import_node_fs2.default.readFileSync(filePath, "utf8");
|
|
147
155
|
return generateTsSchema(schemaText);
|
|
148
156
|
}
|
|
149
157
|
__name(generateTsSchemaFromFile, "generateTsSchemaFromFile");
|
|
158
|
+
async function generateTsSchemaInPlace(schemaPath) {
|
|
159
|
+
const workDir = import_node_path2.default.dirname(schemaPath);
|
|
160
|
+
const pluginModelFiles = import_glob.glob.sync(import_node_path2.default.resolve(__dirname, "../../runtime/src/plugins/**/plugin.zmodel"));
|
|
161
|
+
const result = await (0, import_language.loadDocument)(schemaPath, pluginModelFiles);
|
|
162
|
+
if (!result.success) {
|
|
163
|
+
throw new Error(`Failed to load schema from ${schemaPath}: ${result.errors}`);
|
|
164
|
+
}
|
|
165
|
+
const generator = new import_sdk.TsSchemaGenerator();
|
|
166
|
+
await generator.generate(result.model, workDir);
|
|
167
|
+
return compileAndLoad(workDir);
|
|
168
|
+
}
|
|
169
|
+
__name(generateTsSchemaInPlace, "generateTsSchemaInPlace");
|
|
150
170
|
// Annotate the CommonJS export names for ESM import in node:
|
|
151
171
|
0 && (module.exports = {
|
|
152
172
|
createTestProject,
|
|
153
173
|
generateTsSchema,
|
|
154
|
-
generateTsSchemaFromFile
|
|
174
|
+
generateTsSchemaFromFile,
|
|
175
|
+
generateTsSchemaInPlace
|
|
155
176
|
});
|
|
156
177
|
//# sourceMappingURL=index.cjs.map
|
package/dist/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts","../src/project.ts","../src/schema.ts"],"sourcesContent":["export * from './project';\nexport * from './schema';\n","import fs from 'node:fs';\nimport path from 'node:path';\nimport tmp from 'tmp';\n\nexport function createTestProject() {\n const { name: workDir } = tmp.dirSync({ unsafeCleanup: true });\n\n fs.mkdirSync(path.join(workDir, 'node_modules'));\n\n // symlink all entries from \"node_modules\"\n const nodeModules = fs.readdirSync(path.join(__dirname, '../node_modules'));\n for (const entry of nodeModules) {\n if (entry.startsWith('@zenstackhq')) {\n continue;\n }\n fs.symlinkSync(\n path.join(__dirname, '../node_modules', entry),\n path.join(workDir, 'node_modules', entry),\n 'dir',\n );\n }\n\n // in addition, symlink zenstack packages\n const zenstackPackages = ['language', 'sdk', 'runtime', 'cli'];\n fs.mkdirSync(path.join(workDir, 'node_modules/@zenstackhq'));\n for (const pkg of zenstackPackages) {\n fs.symlinkSync(\n path.join(__dirname, `../../${pkg}`),\n path.join(workDir, `node_modules/@zenstackhq/${pkg}`),\n 'dir',\n );\n }\n\n fs.writeFileSync(\n path.join(workDir, 'package.json'),\n JSON.stringify(\n {\n name: 'test',\n version: '1.0.0',\n type: 'module',\n },\n null,\n 4,\n ),\n );\n\n fs.writeFileSync(\n path.join(workDir, 'tsconfig.json'),\n JSON.stringify(\n {\n compilerOptions: {\n module: 'ESNext',\n target: 'ESNext',\n moduleResolution: 'Bundler',\n esModuleInterop: true,\n skipLibCheck: true,\n strict: true,\n },\n include: ['**/*.ts'],\n },\n null,\n 4,\n ),\n );\n\n return workDir;\n}\n","import { TsSchemaGenerator } from '@zenstackhq/sdk';\nimport type { SchemaDef } from '@zenstackhq/sdk/schema';\nimport { glob } from 'glob';\nimport { execSync } from 'node:child_process';\nimport fs from 'node:fs';\nimport path from 'node:path';\nimport { match } from 'ts-pattern';\nimport { createTestProject } from './project';\n\nfunction makePrelude(provider: 'sqlite' | 'postgresql',
|
|
1
|
+
{"version":3,"sources":["../src/index.ts","../src/project.ts","../src/schema.ts"],"sourcesContent":["export * from './project';\nexport * from './schema';\n","import fs from 'node:fs';\nimport path from 'node:path';\nimport tmp from 'tmp';\n\nexport function createTestProject() {\n const { name: workDir } = tmp.dirSync({ unsafeCleanup: true });\n\n fs.mkdirSync(path.join(workDir, 'node_modules'));\n\n // symlink all entries from \"node_modules\"\n const nodeModules = fs.readdirSync(path.join(__dirname, '../node_modules'));\n for (const entry of nodeModules) {\n if (entry.startsWith('@zenstackhq')) {\n continue;\n }\n fs.symlinkSync(\n path.join(__dirname, '../node_modules', entry),\n path.join(workDir, 'node_modules', entry),\n 'dir',\n );\n }\n\n // in addition, symlink zenstack packages\n const zenstackPackages = ['language', 'sdk', 'runtime', 'cli'];\n fs.mkdirSync(path.join(workDir, 'node_modules/@zenstackhq'));\n for (const pkg of zenstackPackages) {\n fs.symlinkSync(\n path.join(__dirname, `../../${pkg}`),\n path.join(workDir, `node_modules/@zenstackhq/${pkg}`),\n 'dir',\n );\n }\n\n fs.writeFileSync(\n path.join(workDir, 'package.json'),\n JSON.stringify(\n {\n name: 'test',\n version: '1.0.0',\n type: 'module',\n },\n null,\n 4,\n ),\n );\n\n fs.writeFileSync(\n path.join(workDir, 'tsconfig.json'),\n JSON.stringify(\n {\n compilerOptions: {\n module: 'ESNext',\n target: 'ESNext',\n moduleResolution: 'Bundler',\n esModuleInterop: true,\n skipLibCheck: true,\n strict: true,\n },\n include: ['**/*.ts'],\n },\n null,\n 4,\n ),\n );\n\n return workDir;\n}\n","import { loadDocument } from '@zenstackhq/language';\nimport { TsSchemaGenerator } from '@zenstackhq/sdk';\nimport type { SchemaDef } from '@zenstackhq/sdk/schema';\nimport { glob } from 'glob';\nimport { execSync } from 'node:child_process';\nimport fs from 'node:fs';\nimport path from 'node:path';\nimport { match } from 'ts-pattern';\nimport { createTestProject } from './project';\n\nfunction makePrelude(provider: 'sqlite' | 'postgresql', dbUrl?: string) {\n return match(provider)\n .with('sqlite', () => {\n return `\ndatasource db {\n provider = 'sqlite'\n url = '${dbUrl ?? 'file:./test.db'}'\n}\n`;\n })\n .with('postgresql', () => {\n return `\ndatasource db {\n provider = 'postgresql'\n url = '${dbUrl ?? 'postgres://postgres:postgres@localhost:5432/db'}'\n}\n`;\n })\n .exhaustive();\n}\n\nexport async function generateTsSchema(\n schemaText: string,\n provider: 'sqlite' | 'postgresql' = 'sqlite',\n dbUrl?: string,\n extraSourceFiles?: Record<string, string>,\n) {\n const workDir = createTestProject();\n\n const zmodelPath = path.join(workDir, 'schema.zmodel');\n const noPrelude = schemaText.includes('datasource ');\n fs.writeFileSync(zmodelPath, `${noPrelude ? '' : makePrelude(provider, dbUrl)}\\n\\n${schemaText}`);\n\n const pluginModelFiles = glob.sync(path.resolve(__dirname, '../../runtime/src/plugins/**/plugin.zmodel'));\n const result = await loadDocument(zmodelPath, pluginModelFiles);\n if (!result.success) {\n throw new Error(`Failed to load schema from ${zmodelPath}: ${result.errors}`);\n }\n\n const generator = new TsSchemaGenerator();\n await generator.generate(result.model, workDir);\n\n if (extraSourceFiles) {\n for (const [fileName, content] of Object.entries(extraSourceFiles)) {\n const filePath = path.resolve(workDir, `${fileName}.ts`);\n fs.mkdirSync(path.dirname(filePath), { recursive: true });\n fs.writeFileSync(filePath, content);\n }\n }\n\n // compile the generated TS schema\n return compileAndLoad(workDir);\n}\n\nasync function compileAndLoad(workDir: string) {\n execSync('npx tsc', {\n cwd: workDir,\n stdio: 'inherit',\n });\n\n // load the schema module\n const module = await import(path.join(workDir, 'schema.js'));\n return { workDir, schema: module.schema as SchemaDef };\n}\n\nexport function generateTsSchemaFromFile(filePath: string) {\n const schemaText = fs.readFileSync(filePath, 'utf8');\n return generateTsSchema(schemaText);\n}\n\nexport async function generateTsSchemaInPlace(schemaPath: string) {\n const workDir = path.dirname(schemaPath);\n const pluginModelFiles = glob.sync(path.resolve(__dirname, '../../runtime/src/plugins/**/plugin.zmodel'));\n const result = await loadDocument(schemaPath, pluginModelFiles);\n if (!result.success) {\n throw new Error(`Failed to load schema from ${schemaPath}: ${result.errors}`);\n }\n const generator = new TsSchemaGenerator();\n await generator.generate(result.model, workDir);\n return compileAndLoad(workDir);\n}\n"],"mappings":"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","names":["createTestProject","name","workDir","tmp","dirSync","unsafeCleanup","fs","mkdirSync","path","join","nodeModules","readdirSync","__dirname","entry","startsWith","symlinkSync","zenstackPackages","pkg","writeFileSync","JSON","stringify","version","type","compilerOptions","module","target","moduleResolution","esModuleInterop","skipLibCheck","strict","include","import_node_fs","import_node_path","makePrelude","provider","dbUrl","match","with","exhaustive","generateTsSchema","schemaText","extraSourceFiles","workDir","createTestProject","zmodelPath","path","join","noPrelude","includes","fs","writeFileSync","pluginModelFiles","glob","sync","resolve","__dirname","result","loadDocument","success","Error","errors","generator","TsSchemaGenerator","generate","model","fileName","content","Object","entries","filePath","mkdirSync","dirname","recursive","compileAndLoad","execSync","cwd","stdio","module","schema","generateTsSchemaFromFile","readFileSync","generateTsSchemaInPlace","schemaPath"]}
|
package/dist/index.d.cts
CHANGED
|
@@ -2,7 +2,7 @@ import { SchemaDef } from '@zenstackhq/sdk/schema';
|
|
|
2
2
|
|
|
3
3
|
declare function createTestProject(): string;
|
|
4
4
|
|
|
5
|
-
declare function generateTsSchema(schemaText: string, provider?: 'sqlite' | 'postgresql',
|
|
5
|
+
declare function generateTsSchema(schemaText: string, provider?: 'sqlite' | 'postgresql', dbUrl?: string, extraSourceFiles?: Record<string, string>): Promise<{
|
|
6
6
|
workDir: string;
|
|
7
7
|
schema: SchemaDef;
|
|
8
8
|
}>;
|
|
@@ -10,5 +10,9 @@ declare function generateTsSchemaFromFile(filePath: string): Promise<{
|
|
|
10
10
|
workDir: string;
|
|
11
11
|
schema: SchemaDef;
|
|
12
12
|
}>;
|
|
13
|
+
declare function generateTsSchemaInPlace(schemaPath: string): Promise<{
|
|
14
|
+
workDir: string;
|
|
15
|
+
schema: SchemaDef;
|
|
16
|
+
}>;
|
|
13
17
|
|
|
14
|
-
export { createTestProject, generateTsSchema, generateTsSchemaFromFile };
|
|
18
|
+
export { createTestProject, generateTsSchema, generateTsSchemaFromFile, generateTsSchemaInPlace };
|
package/dist/index.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { SchemaDef } from '@zenstackhq/sdk/schema';
|
|
|
2
2
|
|
|
3
3
|
declare function createTestProject(): string;
|
|
4
4
|
|
|
5
|
-
declare function generateTsSchema(schemaText: string, provider?: 'sqlite' | 'postgresql',
|
|
5
|
+
declare function generateTsSchema(schemaText: string, provider?: 'sqlite' | 'postgresql', dbUrl?: string, extraSourceFiles?: Record<string, string>): Promise<{
|
|
6
6
|
workDir: string;
|
|
7
7
|
schema: SchemaDef;
|
|
8
8
|
}>;
|
|
@@ -10,5 +10,9 @@ declare function generateTsSchemaFromFile(filePath: string): Promise<{
|
|
|
10
10
|
workDir: string;
|
|
11
11
|
schema: SchemaDef;
|
|
12
12
|
}>;
|
|
13
|
+
declare function generateTsSchemaInPlace(schemaPath: string): Promise<{
|
|
14
|
+
workDir: string;
|
|
15
|
+
schema: SchemaDef;
|
|
16
|
+
}>;
|
|
13
17
|
|
|
14
|
-
export { createTestProject, generateTsSchema, generateTsSchemaFromFile };
|
|
18
|
+
export { createTestProject, generateTsSchema, generateTsSchemaFromFile, generateTsSchemaInPlace };
|
package/dist/index.js
CHANGED
|
@@ -50,42 +50,45 @@ function createTestProject() {
|
|
|
50
50
|
__name(createTestProject, "createTestProject");
|
|
51
51
|
|
|
52
52
|
// src/schema.ts
|
|
53
|
+
import { loadDocument } from "@zenstackhq/language";
|
|
53
54
|
import { TsSchemaGenerator } from "@zenstackhq/sdk";
|
|
54
55
|
import { glob } from "glob";
|
|
55
56
|
import { execSync } from "child_process";
|
|
56
57
|
import fs2 from "fs";
|
|
57
58
|
import path2 from "path";
|
|
58
59
|
import { match } from "ts-pattern";
|
|
59
|
-
function makePrelude(provider,
|
|
60
|
+
function makePrelude(provider, dbUrl) {
|
|
60
61
|
return match(provider).with("sqlite", () => {
|
|
61
62
|
return `
|
|
62
63
|
datasource db {
|
|
63
64
|
provider = 'sqlite'
|
|
64
|
-
url = '${
|
|
65
|
+
url = '${dbUrl ?? "file:./test.db"}'
|
|
65
66
|
}
|
|
66
67
|
`;
|
|
67
68
|
}).with("postgresql", () => {
|
|
68
69
|
return `
|
|
69
70
|
datasource db {
|
|
70
71
|
provider = 'postgresql'
|
|
71
|
-
url = 'postgres://postgres:postgres@localhost:5432
|
|
72
|
+
url = '${dbUrl ?? "postgres://postgres:postgres@localhost:5432/db"}'
|
|
72
73
|
}
|
|
73
74
|
`;
|
|
74
75
|
}).exhaustive();
|
|
75
76
|
}
|
|
76
77
|
__name(makePrelude, "makePrelude");
|
|
77
|
-
async function generateTsSchema(schemaText, provider = "sqlite",
|
|
78
|
+
async function generateTsSchema(schemaText, provider = "sqlite", dbUrl, extraSourceFiles) {
|
|
78
79
|
const workDir = createTestProject();
|
|
79
|
-
console.log(`Work directory: ${workDir}`);
|
|
80
80
|
const zmodelPath = path2.join(workDir, "schema.zmodel");
|
|
81
81
|
const noPrelude = schemaText.includes("datasource ");
|
|
82
|
-
fs2.writeFileSync(zmodelPath, `${noPrelude ? "" : makePrelude(provider,
|
|
82
|
+
fs2.writeFileSync(zmodelPath, `${noPrelude ? "" : makePrelude(provider, dbUrl)}
|
|
83
83
|
|
|
84
84
|
${schemaText}`);
|
|
85
85
|
const pluginModelFiles = glob.sync(path2.resolve(__dirname, "../../runtime/src/plugins/**/plugin.zmodel"));
|
|
86
|
+
const result = await loadDocument(zmodelPath, pluginModelFiles);
|
|
87
|
+
if (!result.success) {
|
|
88
|
+
throw new Error(`Failed to load schema from ${zmodelPath}: ${result.errors}`);
|
|
89
|
+
}
|
|
86
90
|
const generator = new TsSchemaGenerator();
|
|
87
|
-
|
|
88
|
-
await generator.generate(zmodelPath, pluginModelFiles, tsPath);
|
|
91
|
+
await generator.generate(result.model, workDir);
|
|
89
92
|
if (extraSourceFiles) {
|
|
90
93
|
for (const [fileName, content] of Object.entries(extraSourceFiles)) {
|
|
91
94
|
const filePath = path2.resolve(workDir, `${fileName}.ts`);
|
|
@@ -95,6 +98,10 @@ ${schemaText}`);
|
|
|
95
98
|
fs2.writeFileSync(filePath, content);
|
|
96
99
|
}
|
|
97
100
|
}
|
|
101
|
+
return compileAndLoad(workDir);
|
|
102
|
+
}
|
|
103
|
+
__name(generateTsSchema, "generateTsSchema");
|
|
104
|
+
async function compileAndLoad(workDir) {
|
|
98
105
|
execSync("npx tsc", {
|
|
99
106
|
cwd: workDir,
|
|
100
107
|
stdio: "inherit"
|
|
@@ -105,15 +112,28 @@ ${schemaText}`);
|
|
|
105
112
|
schema: module.schema
|
|
106
113
|
};
|
|
107
114
|
}
|
|
108
|
-
__name(
|
|
115
|
+
__name(compileAndLoad, "compileAndLoad");
|
|
109
116
|
function generateTsSchemaFromFile(filePath) {
|
|
110
117
|
const schemaText = fs2.readFileSync(filePath, "utf8");
|
|
111
118
|
return generateTsSchema(schemaText);
|
|
112
119
|
}
|
|
113
120
|
__name(generateTsSchemaFromFile, "generateTsSchemaFromFile");
|
|
121
|
+
async function generateTsSchemaInPlace(schemaPath) {
|
|
122
|
+
const workDir = path2.dirname(schemaPath);
|
|
123
|
+
const pluginModelFiles = glob.sync(path2.resolve(__dirname, "../../runtime/src/plugins/**/plugin.zmodel"));
|
|
124
|
+
const result = await loadDocument(schemaPath, pluginModelFiles);
|
|
125
|
+
if (!result.success) {
|
|
126
|
+
throw new Error(`Failed to load schema from ${schemaPath}: ${result.errors}`);
|
|
127
|
+
}
|
|
128
|
+
const generator = new TsSchemaGenerator();
|
|
129
|
+
await generator.generate(result.model, workDir);
|
|
130
|
+
return compileAndLoad(workDir);
|
|
131
|
+
}
|
|
132
|
+
__name(generateTsSchemaInPlace, "generateTsSchemaInPlace");
|
|
114
133
|
export {
|
|
115
134
|
createTestProject,
|
|
116
135
|
generateTsSchema,
|
|
117
|
-
generateTsSchemaFromFile
|
|
136
|
+
generateTsSchemaFromFile,
|
|
137
|
+
generateTsSchemaInPlace
|
|
118
138
|
};
|
|
119
139
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/project.ts","../src/schema.ts"],"sourcesContent":["import fs from 'node:fs';\nimport path from 'node:path';\nimport tmp from 'tmp';\n\nexport function createTestProject() {\n const { name: workDir } = tmp.dirSync({ unsafeCleanup: true });\n\n fs.mkdirSync(path.join(workDir, 'node_modules'));\n\n // symlink all entries from \"node_modules\"\n const nodeModules = fs.readdirSync(path.join(__dirname, '../node_modules'));\n for (const entry of nodeModules) {\n if (entry.startsWith('@zenstackhq')) {\n continue;\n }\n fs.symlinkSync(\n path.join(__dirname, '../node_modules', entry),\n path.join(workDir, 'node_modules', entry),\n 'dir',\n );\n }\n\n // in addition, symlink zenstack packages\n const zenstackPackages = ['language', 'sdk', 'runtime', 'cli'];\n fs.mkdirSync(path.join(workDir, 'node_modules/@zenstackhq'));\n for (const pkg of zenstackPackages) {\n fs.symlinkSync(\n path.join(__dirname, `../../${pkg}`),\n path.join(workDir, `node_modules/@zenstackhq/${pkg}`),\n 'dir',\n );\n }\n\n fs.writeFileSync(\n path.join(workDir, 'package.json'),\n JSON.stringify(\n {\n name: 'test',\n version: '1.0.0',\n type: 'module',\n },\n null,\n 4,\n ),\n );\n\n fs.writeFileSync(\n path.join(workDir, 'tsconfig.json'),\n JSON.stringify(\n {\n compilerOptions: {\n module: 'ESNext',\n target: 'ESNext',\n moduleResolution: 'Bundler',\n esModuleInterop: true,\n skipLibCheck: true,\n strict: true,\n },\n include: ['**/*.ts'],\n },\n null,\n 4,\n ),\n );\n\n return workDir;\n}\n","import { TsSchemaGenerator } from '@zenstackhq/sdk';\nimport type { SchemaDef } from '@zenstackhq/sdk/schema';\nimport { glob } from 'glob';\nimport { execSync } from 'node:child_process';\nimport fs from 'node:fs';\nimport path from 'node:path';\nimport { match } from 'ts-pattern';\nimport { createTestProject } from './project';\n\nfunction makePrelude(provider: 'sqlite' | 'postgresql',
|
|
1
|
+
{"version":3,"sources":["../src/project.ts","../src/schema.ts"],"sourcesContent":["import fs from 'node:fs';\nimport path from 'node:path';\nimport tmp from 'tmp';\n\nexport function createTestProject() {\n const { name: workDir } = tmp.dirSync({ unsafeCleanup: true });\n\n fs.mkdirSync(path.join(workDir, 'node_modules'));\n\n // symlink all entries from \"node_modules\"\n const nodeModules = fs.readdirSync(path.join(__dirname, '../node_modules'));\n for (const entry of nodeModules) {\n if (entry.startsWith('@zenstackhq')) {\n continue;\n }\n fs.symlinkSync(\n path.join(__dirname, '../node_modules', entry),\n path.join(workDir, 'node_modules', entry),\n 'dir',\n );\n }\n\n // in addition, symlink zenstack packages\n const zenstackPackages = ['language', 'sdk', 'runtime', 'cli'];\n fs.mkdirSync(path.join(workDir, 'node_modules/@zenstackhq'));\n for (const pkg of zenstackPackages) {\n fs.symlinkSync(\n path.join(__dirname, `../../${pkg}`),\n path.join(workDir, `node_modules/@zenstackhq/${pkg}`),\n 'dir',\n );\n }\n\n fs.writeFileSync(\n path.join(workDir, 'package.json'),\n JSON.stringify(\n {\n name: 'test',\n version: '1.0.0',\n type: 'module',\n },\n null,\n 4,\n ),\n );\n\n fs.writeFileSync(\n path.join(workDir, 'tsconfig.json'),\n JSON.stringify(\n {\n compilerOptions: {\n module: 'ESNext',\n target: 'ESNext',\n moduleResolution: 'Bundler',\n esModuleInterop: true,\n skipLibCheck: true,\n strict: true,\n },\n include: ['**/*.ts'],\n },\n null,\n 4,\n ),\n );\n\n return workDir;\n}\n","import { loadDocument } from '@zenstackhq/language';\nimport { TsSchemaGenerator } from '@zenstackhq/sdk';\nimport type { SchemaDef } from '@zenstackhq/sdk/schema';\nimport { glob } from 'glob';\nimport { execSync } from 'node:child_process';\nimport fs from 'node:fs';\nimport path from 'node:path';\nimport { match } from 'ts-pattern';\nimport { createTestProject } from './project';\n\nfunction makePrelude(provider: 'sqlite' | 'postgresql', dbUrl?: string) {\n return match(provider)\n .with('sqlite', () => {\n return `\ndatasource db {\n provider = 'sqlite'\n url = '${dbUrl ?? 'file:./test.db'}'\n}\n`;\n })\n .with('postgresql', () => {\n return `\ndatasource db {\n provider = 'postgresql'\n url = '${dbUrl ?? 'postgres://postgres:postgres@localhost:5432/db'}'\n}\n`;\n })\n .exhaustive();\n}\n\nexport async function generateTsSchema(\n schemaText: string,\n provider: 'sqlite' | 'postgresql' = 'sqlite',\n dbUrl?: string,\n extraSourceFiles?: Record<string, string>,\n) {\n const workDir = createTestProject();\n\n const zmodelPath = path.join(workDir, 'schema.zmodel');\n const noPrelude = schemaText.includes('datasource ');\n fs.writeFileSync(zmodelPath, `${noPrelude ? '' : makePrelude(provider, dbUrl)}\\n\\n${schemaText}`);\n\n const pluginModelFiles = glob.sync(path.resolve(__dirname, '../../runtime/src/plugins/**/plugin.zmodel'));\n const result = await loadDocument(zmodelPath, pluginModelFiles);\n if (!result.success) {\n throw new Error(`Failed to load schema from ${zmodelPath}: ${result.errors}`);\n }\n\n const generator = new TsSchemaGenerator();\n await generator.generate(result.model, workDir);\n\n if (extraSourceFiles) {\n for (const [fileName, content] of Object.entries(extraSourceFiles)) {\n const filePath = path.resolve(workDir, `${fileName}.ts`);\n fs.mkdirSync(path.dirname(filePath), { recursive: true });\n fs.writeFileSync(filePath, content);\n }\n }\n\n // compile the generated TS schema\n return compileAndLoad(workDir);\n}\n\nasync function compileAndLoad(workDir: string) {\n execSync('npx tsc', {\n cwd: workDir,\n stdio: 'inherit',\n });\n\n // load the schema module\n const module = await import(path.join(workDir, 'schema.js'));\n return { workDir, schema: module.schema as SchemaDef };\n}\n\nexport function generateTsSchemaFromFile(filePath: string) {\n const schemaText = fs.readFileSync(filePath, 'utf8');\n return generateTsSchema(schemaText);\n}\n\nexport async function generateTsSchemaInPlace(schemaPath: string) {\n const workDir = path.dirname(schemaPath);\n const pluginModelFiles = glob.sync(path.resolve(__dirname, '../../runtime/src/plugins/**/plugin.zmodel'));\n const result = await loadDocument(schemaPath, pluginModelFiles);\n if (!result.success) {\n throw new Error(`Failed to load schema from ${schemaPath}: ${result.errors}`);\n }\n const generator = new TsSchemaGenerator();\n await generator.generate(result.model, workDir);\n return compileAndLoad(workDir);\n}\n"],"mappings":";;;;AAAA,OAAOA,QAAQ;AACf,OAAOC,UAAU;AACjB,OAAOC,SAAS;AAET,SAASC,oBAAAA;AACZ,QAAM,EAAEC,MAAMC,QAAO,IAAKC,IAAIC,QAAQ;IAAEC,eAAe;EAAK,CAAA;AAE5DC,KAAGC,UAAUC,KAAKC,KAAKP,SAAS,cAAA,CAAA;AAGhC,QAAMQ,cAAcJ,GAAGK,YAAYH,KAAKC,KAAKG,WAAW,iBAAA,CAAA;AACxD,aAAWC,SAASH,aAAa;AAC7B,QAAIG,MAAMC,WAAW,aAAA,GAAgB;AACjC;IACJ;AACAR,OAAGS,YACCP,KAAKC,KAAKG,WAAW,mBAAmBC,KAAAA,GACxCL,KAAKC,KAAKP,SAAS,gBAAgBW,KAAAA,GACnC,KAAA;EAER;AAGA,QAAMG,mBAAmB;IAAC;IAAY;IAAO;IAAW;;AACxDV,KAAGC,UAAUC,KAAKC,KAAKP,SAAS,0BAAA,CAAA;AAChC,aAAWe,OAAOD,kBAAkB;AAChCV,OAAGS,YACCP,KAAKC,KAAKG,WAAW,SAASK,GAAAA,EAAK,GACnCT,KAAKC,KAAKP,SAAS,4BAA4Be,GAAAA,EAAK,GACpD,KAAA;EAER;AAEAX,KAAGY,cACCV,KAAKC,KAAKP,SAAS,cAAA,GACnBiB,KAAKC,UACD;IACInB,MAAM;IACNoB,SAAS;IACTC,MAAM;EACV,GACA,MACA,CAAA,CAAA;AAIRhB,KAAGY,cACCV,KAAKC,KAAKP,SAAS,eAAA,GACnBiB,KAAKC,UACD;IACIG,iBAAiB;MACbC,QAAQ;MACRC,QAAQ;MACRC,kBAAkB;MAClBC,iBAAiB;MACjBC,cAAc;MACdC,QAAQ;IACZ;IACAC,SAAS;MAAC;;EACd,GACA,MACA,CAAA,CAAA;AAIR,SAAO5B;AACX;AA9DgBF;;;ACJhB,SAAS+B,oBAAoB;AAC7B,SAASC,yBAAyB;AAElC,SAASC,YAAY;AACrB,SAASC,gBAAgB;AACzB,OAAOC,SAAQ;AACf,OAAOC,WAAU;AACjB,SAASC,aAAa;AAGtB,SAASC,YAAYC,UAAmCC,OAAc;AAClE,SAAOC,MAAMF,QAAAA,EACRG,KAAK,UAAU,MAAA;AACZ,WAAO;;;aAGNF,SAAS,gBAAA;;;EAGd,CAAA,EACCE,KAAK,cAAc,MAAA;AAChB,WAAO;;;aAGNF,SAAS,gDAAA;;;EAGd,CAAA,EACCG,WAAU;AACnB;AAnBSL;AAqBT,eAAsBM,iBAClBC,YACAN,WAAoC,UACpCC,OACAM,kBAAyC;AAEzC,QAAMC,UAAUC,kBAAAA;AAEhB,QAAMC,aAAaC,MAAKC,KAAKJ,SAAS,eAAA;AACtC,QAAMK,YAAYP,WAAWQ,SAAS,aAAA;AACtCC,EAAAA,IAAGC,cAAcN,YAAY,GAAGG,YAAY,KAAKd,YAAYC,UAAUC,KAAAA,CAAAA;;EAAaK,UAAAA,EAAY;AAEhG,QAAMW,mBAAmBC,KAAKC,KAAKR,MAAKS,QAAQC,WAAW,4CAAA,CAAA;AAC3D,QAAMC,SAAS,MAAMC,aAAab,YAAYO,gBAAAA;AAC9C,MAAI,CAACK,OAAOE,SAAS;AACjB,UAAM,IAAIC,MAAM,8BAA8Bf,UAAAA,KAAeY,OAAOI,MAAM,EAAE;EAChF;AAEA,QAAMC,YAAY,IAAIC,kBAAAA;AACtB,QAAMD,UAAUE,SAASP,OAAOQ,OAAOtB,OAAAA;AAEvC,MAAID,kBAAkB;AAClB,eAAW,CAACwB,UAAUC,OAAAA,KAAYC,OAAOC,QAAQ3B,gBAAAA,GAAmB;AAChE,YAAM4B,WAAWxB,MAAKS,QAAQZ,SAAS,GAAGuB,QAAAA,KAAa;AACvDhB,MAAAA,IAAGqB,UAAUzB,MAAK0B,QAAQF,QAAAA,GAAW;QAAEG,WAAW;MAAK,CAAA;AACvDvB,MAAAA,IAAGC,cAAcmB,UAAUH,OAAAA;IAC/B;EACJ;AAGA,SAAOO,eAAe/B,OAAAA;AAC1B;AA/BsBH;AAiCtB,eAAekC,eAAe/B,SAAe;AACzCgC,WAAS,WAAW;IAChBC,KAAKjC;IACLkC,OAAO;EACX,CAAA;AAGA,QAAMC,SAAS,MAAM,OAAOhC,MAAKC,KAAKJ,SAAS,WAAA;AAC/C,SAAO;IAAEA;IAASoC,QAAQD,OAAOC;EAAoB;AACzD;AATeL;AAWR,SAASM,yBAAyBV,UAAgB;AACrD,QAAM7B,aAAaS,IAAG+B,aAAaX,UAAU,MAAA;AAC7C,SAAO9B,iBAAiBC,UAAAA;AAC5B;AAHgBuC;AAKhB,eAAsBE,wBAAwBC,YAAkB;AAC5D,QAAMxC,UAAUG,MAAK0B,QAAQW,UAAAA;AAC7B,QAAM/B,mBAAmBC,KAAKC,KAAKR,MAAKS,QAAQC,WAAW,4CAAA,CAAA;AAC3D,QAAMC,SAAS,MAAMC,aAAayB,YAAY/B,gBAAAA;AAC9C,MAAI,CAACK,OAAOE,SAAS;AACjB,UAAM,IAAIC,MAAM,8BAA8BuB,UAAAA,KAAe1B,OAAOI,MAAM,EAAE;EAChF;AACA,QAAMC,YAAY,IAAIC,kBAAAA;AACtB,QAAMD,UAAUE,SAASP,OAAOQ,OAAOtB,OAAAA;AACvC,SAAO+B,eAAe/B,OAAAA;AAC1B;AAVsBuC;","names":["fs","path","tmp","createTestProject","name","workDir","tmp","dirSync","unsafeCleanup","fs","mkdirSync","path","join","nodeModules","readdirSync","__dirname","entry","startsWith","symlinkSync","zenstackPackages","pkg","writeFileSync","JSON","stringify","version","type","compilerOptions","module","target","moduleResolution","esModuleInterop","skipLibCheck","strict","include","loadDocument","TsSchemaGenerator","glob","execSync","fs","path","match","makePrelude","provider","dbUrl","match","with","exhaustive","generateTsSchema","schemaText","extraSourceFiles","workDir","createTestProject","zmodelPath","path","join","noPrelude","includes","fs","writeFileSync","pluginModelFiles","glob","sync","resolve","__dirname","result","loadDocument","success","Error","errors","generator","TsSchemaGenerator","generate","model","fileName","content","Object","entries","filePath","mkdirSync","dirname","recursive","compileAndLoad","execSync","cwd","stdio","module","schema","generateTsSchemaFromFile","readFileSync","generateTsSchemaInPlace","schemaPath"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zenstackhq/testtools",
|
|
3
|
-
"version": "3.0.0-
|
|
3
|
+
"version": "3.0.0-beta.2",
|
|
4
4
|
"description": "ZenStack Test Tools",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"keywords": [],
|
|
@@ -25,22 +25,23 @@
|
|
|
25
25
|
"glob": "^11.0.2",
|
|
26
26
|
"tmp": "^0.2.3",
|
|
27
27
|
"ts-pattern": "^5.7.1",
|
|
28
|
-
"prisma": "^6.
|
|
29
|
-
"typescript": "^5.
|
|
30
|
-
"@zenstackhq/
|
|
31
|
-
"@zenstackhq/
|
|
28
|
+
"prisma": "^6.10.0",
|
|
29
|
+
"typescript": "^5.8.0",
|
|
30
|
+
"@zenstackhq/sdk": "3.0.0-beta.2",
|
|
31
|
+
"@zenstackhq/language": "3.0.0-beta.2"
|
|
32
32
|
},
|
|
33
33
|
"peerDependencies": {
|
|
34
|
-
"better-sqlite3": "^
|
|
34
|
+
"better-sqlite3": "^12.2.0",
|
|
35
35
|
"pg": "^8.13.1"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
+
"@types/node": "^20.17.24",
|
|
38
39
|
"@types/tmp": "^0.2.6",
|
|
39
|
-
"@zenstackhq/eslint-config": "3.0.0-
|
|
40
|
-
"@zenstackhq/typescript-config": "3.0.0-
|
|
40
|
+
"@zenstackhq/eslint-config": "3.0.0-beta.2",
|
|
41
|
+
"@zenstackhq/typescript-config": "3.0.0-beta.2"
|
|
41
42
|
},
|
|
42
43
|
"scripts": {
|
|
43
|
-
"build": "tsup-node",
|
|
44
|
+
"build": "tsc --noEmit && tsup-node",
|
|
44
45
|
"watch": "tsup-node --watch",
|
|
45
46
|
"lint": "eslint src --ext ts",
|
|
46
47
|
"pack": "pnpm pack"
|