strapi-typed-client 1.5.1 → 1.5.3
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 +6 -2
- package/dist/cli/commands/check.d.ts.map +1 -1
- package/dist/cli/commands/check.js +15 -1
- package/dist/cli/commands/check.js.map +1 -1
- package/dist/cli/commands/generate.d.ts.map +1 -1
- package/dist/cli/commands/generate.js +17 -3
- package/dist/cli/commands/generate.js.map +1 -1
- package/dist/cli/utils/file-writer.d.ts +7 -0
- package/dist/cli/utils/file-writer.d.ts.map +1 -1
- package/dist/cli/utils/file-writer.js +21 -3
- package/dist/cli/utils/file-writer.js.map +1 -1
- package/dist/core/schema-transformer.d.ts.map +1 -1
- package/dist/core/schema-transformer.js +10 -2
- package/dist/core/schema-transformer.js.map +1 -1
- package/dist/generator/client-generator.d.ts +8 -1
- package/dist/generator/client-generator.d.ts.map +1 -1
- package/dist/generator/client-generator.js +62 -23
- package/dist/generator/client-generator.js.map +1 -1
- package/dist/generator/index.d.ts +1 -1
- package/dist/generator/index.d.ts.map +1 -1
- package/dist/generator/index.js +2 -2
- package/dist/generator/index.js.map +1 -1
- package/dist/next/index.d.ts.map +1 -1
- package/dist/next/index.js +7 -5
- package/dist/next/index.js.map +1 -1
- package/dist/plugin/server/src/controllers/schema.d.ts +1 -0
- package/dist/plugin/server/src/controllers/schema.d.ts.map +1 -1
- package/dist/plugin/server/src/controllers/schema.js +5 -2
- package/dist/plugin/server/src/controllers/schema.js.map +1 -1
- package/dist/shared/version.d.ts +9 -0
- package/dist/shared/version.d.ts.map +1 -0
- package/dist/shared/version.js +28 -0
- package/dist/shared/version.js.map +1 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -25,14 +25,18 @@ export default {
|
|
|
25
25
|
|
|
26
26
|
### 3. Generate types
|
|
27
27
|
|
|
28
|
+
Generate into your source tree and commit the result:
|
|
29
|
+
|
|
28
30
|
```bash
|
|
29
|
-
npx strapi-types generate --url http://localhost:1337
|
|
31
|
+
npx strapi-types generate --url http://localhost:1337 --output ./src/strapi
|
|
30
32
|
```
|
|
31
33
|
|
|
34
|
+
Committed types survive reinstalls and show up as reviewable diffs. (Omit `--output` for a quick trial that writes into `node_modules` instead — ephemeral, wiped on reinstall.)
|
|
35
|
+
|
|
32
36
|
### 4. Use
|
|
33
37
|
|
|
34
38
|
```typescript
|
|
35
|
-
import { StrapiClient } from 'strapi
|
|
39
|
+
import { StrapiClient } from '@/strapi'
|
|
36
40
|
|
|
37
41
|
const strapi = new StrapiClient({
|
|
38
42
|
baseURL: 'http://localhost:1337',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/check.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/check.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH,MAAM,WAAW,YAAY;IACzB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,WAAW;IACxB,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;GAEG;AACH,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CA6EvE;AASD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IACxC,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;CACnC,GAAG,IAAI,CA2CP"}
|
|
@@ -3,7 +3,8 @@
|
|
|
3
3
|
* Returns exit code 0 if in sync, 1 if out of sync
|
|
4
4
|
*/
|
|
5
5
|
import { createApiClient } from '../utils/api-client.js';
|
|
6
|
-
import { readLocalSchemaHash, getDefaultOutputDir, } from '../utils/file-writer.js';
|
|
6
|
+
import { readLocalSchemaHash, readLocalGeneratorVersion, getDefaultOutputDir, } from '../utils/file-writer.js';
|
|
7
|
+
import { getGeneratorVersion } from '../../shared/version.js';
|
|
7
8
|
/**
|
|
8
9
|
* Check if local types are in sync with remote schema
|
|
9
10
|
*/
|
|
@@ -20,6 +21,19 @@ export async function check(options) {
|
|
|
20
21
|
error: `No generated client found in ${outputDir}. Run 'strapi-types generate' first.`,
|
|
21
22
|
};
|
|
22
23
|
}
|
|
24
|
+
// Warn (non-fatal) when committed types were produced by a different
|
|
25
|
+
// CLI version than the one installed — they may be missing newer
|
|
26
|
+
// generator fixes/features until regenerated.
|
|
27
|
+
const localVersion = readLocalGeneratorVersion(outputDir);
|
|
28
|
+
const cliVersion = getGeneratorVersion();
|
|
29
|
+
if (!options.silent &&
|
|
30
|
+
localVersion &&
|
|
31
|
+
cliVersion &&
|
|
32
|
+
localVersion !== cliVersion) {
|
|
33
|
+
console.warn(`Warning: generated client was produced by strapi-typed-client v${localVersion}, ` +
|
|
34
|
+
`but the installed CLI is v${cliVersion}.\n` +
|
|
35
|
+
`Run 'strapi-types generate' to refresh.`);
|
|
36
|
+
}
|
|
23
37
|
// Create API client
|
|
24
38
|
const client = createApiClient({
|
|
25
39
|
url: options.url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../src/cli/commands/check.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EACH,mBAAmB,EACnB,mBAAmB,GACtB,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../src/cli/commands/check.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/generate.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/generate.ts"],"names":[],"mappings":"AAAA;;GAEG;AAaH,MAAM,WAAW,eAAe;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;CACvB;AA+BD,MAAM,WAAW,cAAc;IAC3B,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;CACpB;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAC1B,OAAO,EAAE,eAAe,GACzB,OAAO,CAAC,cAAc,CAAC,CAgKzB;AAWD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC3C,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;CACnC,GAAG,IAAI,CAsDP"}
|
|
@@ -7,6 +7,15 @@ import { createApiClient } from '../utils/api-client.js';
|
|
|
7
7
|
import { readLocalSchemaHash, getDefaultOutputDir, } from '../utils/file-writer.js';
|
|
8
8
|
import { Generator } from '../../generator/index.js';
|
|
9
9
|
import { transformSchema } from '../../core/schema-transformer.js';
|
|
10
|
+
import { getGeneratorVersion } from '../../shared/version.js';
|
|
11
|
+
/**
|
|
12
|
+
* Output that lands inside node_modules is ephemeral — a reinstall wipes it,
|
|
13
|
+
* so the types must be regenerated. Used to bar `--format ts` from it and to
|
|
14
|
+
* nudge `--format js` users toward a durable, committable output directory.
|
|
15
|
+
*/
|
|
16
|
+
function isInsideNodeModules(outputDir) {
|
|
17
|
+
return path.resolve(outputDir).split(path.sep).includes('node_modules');
|
|
18
|
+
}
|
|
10
19
|
/**
|
|
11
20
|
* Shipping raw .ts into node_modules breaks at runtime: Node can't require
|
|
12
21
|
* .ts files and the package.json exports still point at the missing .js.
|
|
@@ -15,12 +24,12 @@ import { transformSchema } from '../../core/schema-transformer.js';
|
|
|
15
24
|
function assertOutputDirForFormat(outputDir, format) {
|
|
16
25
|
if (format !== 'ts')
|
|
17
26
|
return;
|
|
18
|
-
|
|
19
|
-
if (normalized.split(path.sep).includes('node_modules')) {
|
|
27
|
+
if (isInsideNodeModules(outputDir)) {
|
|
20
28
|
throw new Error(`--format ts cannot write into node_modules (${outputDir}). ` +
|
|
21
29
|
`Point --output at your source tree (e.g. ./src/strapi).`);
|
|
22
30
|
}
|
|
23
31
|
}
|
|
32
|
+
const dim = (s) => `\x1b[2m${s}\x1b[0m`;
|
|
24
33
|
/**
|
|
25
34
|
* Generate types from Strapi API
|
|
26
35
|
*/
|
|
@@ -102,7 +111,7 @@ export async function generate(options) {
|
|
|
102
111
|
console.log('Generating TypeScript types...');
|
|
103
112
|
}
|
|
104
113
|
const generator = new Generator(outputDir);
|
|
105
|
-
await generator.generate(parsedSchema, endpoints, extraTypes, hash, format);
|
|
114
|
+
await generator.generate(parsedSchema, endpoints, extraTypes, hash, getGeneratorVersion(), format);
|
|
106
115
|
// Track generated files
|
|
107
116
|
const emittedFiles = format === 'ts'
|
|
108
117
|
? ['types.ts', 'client.ts', 'index.ts']
|
|
@@ -117,6 +126,11 @@ export async function generate(options) {
|
|
|
117
126
|
for (const f of emittedFiles) {
|
|
118
127
|
filesWritten.push(path.join(outputDir, f));
|
|
119
128
|
}
|
|
129
|
+
if (!options.silent && isInsideNodeModules(outputDir)) {
|
|
130
|
+
console.log(dim('Types written into node_modules — a reinstall wipes them.\n' +
|
|
131
|
+
'For durable, reviewable types, generate into your source tree and commit it:\n' +
|
|
132
|
+
' strapi-types generate --output ./src/strapi'));
|
|
133
|
+
}
|
|
120
134
|
return {
|
|
121
135
|
success: true,
|
|
122
136
|
filesWritten,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/cli/commands/generate.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EACH,mBAAmB,EACnB,mBAAmB,GACtB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/cli/commands/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,4 +41,11 @@ export declare function getDefaultOutputDir(): string;
|
|
|
41
41
|
* enough and avoids parsing the full client.
|
|
42
42
|
*/
|
|
43
43
|
export declare function readLocalSchemaHash(outputDir: string): string | null;
|
|
44
|
+
/**
|
|
45
|
+
* Read the GENERATOR_VERSION baked into the generated client at generation
|
|
46
|
+
* time. Used to detect when committed types drift from the installed CLI
|
|
47
|
+
* version. Returns null when not generated or the constant is absent (e.g.
|
|
48
|
+
* clients generated before version stamping was introduced).
|
|
49
|
+
*/
|
|
50
|
+
export declare function readLocalGeneratorVersion(outputDir: string): string | null;
|
|
44
51
|
//# sourceMappingURL=file-writer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-writer.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/file-writer.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,KAAK,CAAA;CAChB;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAI/C;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,WAAW,CASxE;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMxD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEpD;AAED;;GAEG;AACH,wBAAgB,UAAU,CACtB,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,GAChD,WAAW,EAAE,CAgBf;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAU5C;AA4BD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"file-writer.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/file-writer.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,KAAK,CAAA;CAChB;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAI/C;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,WAAW,CASxE;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMxD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEpD;AAED;;GAEG;AACH,wBAAgB,UAAU,CACtB,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,GAChD,WAAW,EAAE,CAgBf;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAU5C;AA4BD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEpE;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAE1E"}
|
|
@@ -71,7 +71,7 @@ export function getDefaultOutputDir() {
|
|
|
71
71
|
return './dist';
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
|
-
const
|
|
74
|
+
const HEADER_HEAD_BYTES = 512;
|
|
75
75
|
/**
|
|
76
76
|
* Read the first N bytes of a file without loading the whole thing.
|
|
77
77
|
* SCHEMA_HASH is emitted at the top of client.ts/client.js so this is enough.
|
|
@@ -105,11 +105,29 @@ function readFileHead(filePath, bytes) {
|
|
|
105
105
|
* enough and avoids parsing the full client.
|
|
106
106
|
*/
|
|
107
107
|
export function readLocalSchemaHash(outputDir) {
|
|
108
|
+
return readLocalHeaderConst(outputDir, 'SCHEMA_HASH');
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* Read the GENERATOR_VERSION baked into the generated client at generation
|
|
112
|
+
* time. Used to detect when committed types drift from the installed CLI
|
|
113
|
+
* version. Returns null when not generated or the constant is absent (e.g.
|
|
114
|
+
* clients generated before version stamping was introduced).
|
|
115
|
+
*/
|
|
116
|
+
export function readLocalGeneratorVersion(outputDir) {
|
|
117
|
+
return readLocalHeaderConst(outputDir, 'GENERATOR_VERSION');
|
|
118
|
+
}
|
|
119
|
+
/**
|
|
120
|
+
* Read a `export const <NAME> = '<value>'` baked into the generated client
|
|
121
|
+
* header. Both SCHEMA_HASH and GENERATOR_VERSION live in the first bytes of
|
|
122
|
+
* client.ts/client.js, so reading the head is enough.
|
|
123
|
+
*/
|
|
124
|
+
function readLocalHeaderConst(outputDir, name) {
|
|
125
|
+
const re = new RegExp(`${name}\\s*=\\s*['"]([^'"]*)['"]`);
|
|
108
126
|
for (const file of ['client.ts', 'client.js']) {
|
|
109
|
-
const head = readFileHead(path.join(outputDir, file),
|
|
127
|
+
const head = readFileHead(path.join(outputDir, file), HEADER_HEAD_BYTES);
|
|
110
128
|
if (!head)
|
|
111
129
|
continue;
|
|
112
|
-
const match = head.match(
|
|
130
|
+
const match = head.match(re);
|
|
113
131
|
if (match)
|
|
114
132
|
return match[1];
|
|
115
133
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-writer.js","sourceRoot":"","sources":["../../../src/cli/utils/file-writer.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAQ5B;;GAEG;AACH,MAAM,UAAU,SAAS,CAAC,OAAe;IACrC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC9C,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,SAAS,CAAC,QAAgB,EAAE,OAAe;IACvD,IAAI,CAAC;QACD,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;QACjC,6GAA6G;QAC7G,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;QAC5C,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC5C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAc,EAAE,CAAA;IACpE,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,QAAQ,CAAC,QAAgB;IACrC,IAAI,CAAC;QACD,OAAO,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC7C,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,IAAI,CAAA;IACf,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,QAAgB;IACvC,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;AAClC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CACtB,KAA+C;IAE/C,MAAM,OAAO,GAAkB,EAAE,CAAA;IAEjC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QACjD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAEpB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,CAAC,KAAK,CACT,mBAAmB,IAAI,CAAC,IAAI,GAAG,EAC/B,MAAM,CAAC,KAAK,EAAE,OAAO,CACxB,CAAA;QACL,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAA;AAClB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB;IAC/B,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,aAAa,CAC1B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAC9C,CAAA;QACD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAA;QACxE,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,CAAA;IACvD,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,QAAQ,CAAA;IACnB,CAAC;AACL,CAAC;AAED,MAAM,
|
|
1
|
+
{"version":3,"file":"file-writer.js","sourceRoot":"","sources":["../../../src/cli/utils/file-writer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-transformer.d.ts","sourceRoot":"","sources":["../../src/core/schema-transformer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EACR,YAAY,EASf,MAAM,oBAAoB,CAAA;AAQ3B,OAAO,KAAK,EACR,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,eAAe,EAClB,MAAM,kCAAkC,CAAA;AAEzC,YAAY,EACR,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,eAAe,GAClB,CAAA;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,eAAe,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"schema-transformer.d.ts","sourceRoot":"","sources":["../../src/core/schema-transformer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EACR,YAAY,EASf,MAAM,oBAAoB,CAAA;AAQ3B,OAAO,KAAK,EACR,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,eAAe,EAClB,MAAM,kCAAkC,CAAA;AAEzC,YAAY,EACR,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,eAAe,GAClB,CAAA;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,eAAe,GAAG,YAAY,CAwBxE"}
|
|
@@ -16,18 +16,26 @@ import { toPascalCase, convertComponentName, extractComponentCategory, } from '.
|
|
|
16
16
|
export function transformSchema(extracted) {
|
|
17
17
|
const contentTypes = [];
|
|
18
18
|
const components = [];
|
|
19
|
+
// Sort by UID for a stable canonical order (Strapi registry order isn't
|
|
20
|
+
// guaranteed stable, which otherwise produces ordering-only diff noise)
|
|
19
21
|
// Transform components first (they may be referenced by content types)
|
|
20
|
-
for (const [uid, strapiComponent] of Object.entries(extracted.components)) {
|
|
22
|
+
for (const [uid, strapiComponent] of Object.entries(extracted.components).sort(([a], [b]) => byUid(a, b))) {
|
|
21
23
|
const component = transformComponent(uid, strapiComponent);
|
|
22
24
|
components.push(component);
|
|
23
25
|
}
|
|
24
26
|
// Transform content types
|
|
25
|
-
for (const [uid, strapiContentType] of Object.entries(extracted.contentTypes)) {
|
|
27
|
+
for (const [uid, strapiContentType] of Object.entries(extracted.contentTypes).sort(([a], [b]) => byUid(a, b))) {
|
|
26
28
|
const contentType = transformContentType(uid, strapiContentType);
|
|
27
29
|
contentTypes.push(contentType);
|
|
28
30
|
}
|
|
29
31
|
return { contentTypes, components };
|
|
30
32
|
}
|
|
33
|
+
/**
|
|
34
|
+
* Deterministic, locale-independent UID comparator (codepoint order).
|
|
35
|
+
*/
|
|
36
|
+
function byUid(a, b) {
|
|
37
|
+
return a < b ? -1 : a > b ? 1 : 0;
|
|
38
|
+
}
|
|
31
39
|
/**
|
|
32
40
|
* Transform a single Strapi content type to ParsedSchema ContentType
|
|
33
41
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-transformer.js","sourceRoot":"","sources":["../../src/core/schema-transformer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAcH,OAAO,EACH,YAAY,EACZ,oBAAoB,EACpB,wBAAwB,GAC3B,MAAM,oBAAoB,CAAA;AAgB3B;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,SAA0B;IACtD,MAAM,YAAY,GAAkB,EAAE,CAAA;IACtC,MAAM,UAAU,GAAgB,EAAE,CAAA;IAElC,uEAAuE;IACvE,KAAK,MAAM,CAAC,GAAG,EAAE,eAAe,CAAC,IAAI,MAAM,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"schema-transformer.js","sourceRoot":"","sources":["../../src/core/schema-transformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ export declare class ClientGenerator {
|
|
|
5
5
|
private customApiGenerator;
|
|
6
6
|
private pluginApiGenerator;
|
|
7
7
|
constructor();
|
|
8
|
-
generate(schema: ParsedSchema, endpoints?: ParsedEndpoint[], extraTypes?: ExtraControllerType[], schemaHash?: string): string;
|
|
8
|
+
generate(schema: ParsedSchema, endpoints?: ParsedEndpoint[], extraTypes?: ExtraControllerType[], schemaHash?: string, generatorVersion?: string): string;
|
|
9
9
|
private generateImports;
|
|
10
10
|
private addUtilityTypes;
|
|
11
11
|
private addStrapiValidationIssueInterface;
|
|
@@ -17,8 +17,15 @@ export declare class ClientGenerator {
|
|
|
17
17
|
private addGetPopulatedType;
|
|
18
18
|
private generateCollectionAPI;
|
|
19
19
|
private generateSingleTypeAPI;
|
|
20
|
+
private generateUsersPermissionsUserAPI;
|
|
20
21
|
private generateCustomAPIClasses;
|
|
21
22
|
private buildTypeParams;
|
|
23
|
+
/**
|
|
24
|
+
* Pick the API class wired for a content type. The users-permissions user
|
|
25
|
+
* is special-cased to the flat-envelope class; everything else uses its
|
|
26
|
+
* custom-route class, SingleTypeAPI, or CollectionAPI.
|
|
27
|
+
*/
|
|
28
|
+
private resolveContentTypeApiClass;
|
|
22
29
|
/**
|
|
23
30
|
* Compute which entries of `PLUGIN_REGISTRY` should be active for the
|
|
24
31
|
* current generation. An entry is skipped if the user has a custom
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-generator.d.ts","sourceRoot":"","sources":["../../src/generator/client-generator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAA;AAQ9D,OAAO,KAAK,EACR,cAAc,EACd,mBAAmB,EACtB,MAAM,6BAA6B,CAAA;AA4BpC,qBAAa,eAAe;IACxB,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,kBAAkB,CAAoB;IAC9C,OAAO,CAAC,kBAAkB,CAAoB;;IAQ9C,QAAQ,CACJ,MAAM,EAAE,YAAY,EACpB,SAAS,CAAC,EAAE,cAAc,EAAE,EAC5B,UAAU,CAAC,EAAE,mBAAmB,EAAE,EAClC,UAAU,GAAE,MAAW,
|
|
1
|
+
{"version":3,"file":"client-generator.d.ts","sourceRoot":"","sources":["../../src/generator/client-generator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAA;AAQ9D,OAAO,KAAK,EACR,cAAc,EACd,mBAAmB,EACtB,MAAM,6BAA6B,CAAA;AA4BpC,qBAAa,eAAe;IACxB,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,kBAAkB,CAAoB;IAC9C,OAAO,CAAC,kBAAkB,CAAoB;;IAQ9C,QAAQ,CACJ,MAAM,EAAE,YAAY,EACpB,SAAS,CAAC,EAAE,cAAc,EAAE,EAC5B,UAAU,CAAC,EAAE,mBAAmB,EAAE,EAClC,UAAU,GAAE,MAAW,EACvB,gBAAgB,GAAE,MAAW,GAC9B,MAAM;IAmFT,OAAO,CAAC,eAAe;IAuEvB,OAAO,CAAC,eAAe;IAyOvB,OAAO,CAAC,iCAAiC;IA0BzC,OAAO,CAAC,mBAAmB;IAiD3B,OAAO,CAAC,mBAAmB;IAwF3B,OAAO,CAAC,wBAAwB;IA2BhC,OAAO,CAAC,6BAA6B;IA6CrC,OAAO,CAAC,oBAAoB;IAwK5B,OAAO,CAAC,mBAAmB;IA4B3B,OAAO,CAAC,qBAAqB;IAmK7B,OAAO,CAAC,qBAAqB;IA+D7B,OAAO,CAAC,+BAA+B;IAmBvC,OAAO,CAAC,wBAAwB;IAuEhC,OAAO,CAAC,eAAe;IAavB;;;;OAIG;IACH,OAAO,CAAC,0BAA0B;IAalC;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB;IAqB5B,OAAO,CAAC,oBAAoB;IAyK5B;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,sBAAsB;IAwB9B,OAAO,CAAC,2BAA2B;IA2BnC,OAAO,CAAC,oBAAoB;CA4B/B"}
|
|
@@ -36,7 +36,7 @@ export class ClientGenerator {
|
|
|
36
36
|
this.customApiGenerator = new CustomApiGenerator();
|
|
37
37
|
this.pluginApiGenerator = new PluginApiGenerator();
|
|
38
38
|
}
|
|
39
|
-
generate(schema, endpoints, extraTypes, schemaHash = '') {
|
|
39
|
+
generate(schema, endpoints, extraTypes, schemaHash = '', generatorVersion = '') {
|
|
40
40
|
const project = new Project({ useInMemoryFileSystem: true });
|
|
41
41
|
const sf = project.createSourceFile('client.ts');
|
|
42
42
|
// Parse custom routes and custom types
|
|
@@ -46,15 +46,17 @@ export class ClientGenerator {
|
|
|
46
46
|
const customTypes = convertEndpointsToCustomTypes(endpoints, extraTypes);
|
|
47
47
|
this.customApiGenerator.setCustomTypes(customTypes);
|
|
48
48
|
}
|
|
49
|
-
// Header comments + baked SCHEMA_HASH. Kept at the
|
|
50
|
-
// can read
|
|
51
|
-
// without parsing the rest (see readLocalSchemaHash
|
|
49
|
+
// Header comments + baked SCHEMA_HASH / GENERATOR_VERSION. Kept at the
|
|
50
|
+
// top so CLI tooling can read them by slicing the first few hundred
|
|
51
|
+
// bytes of the file without parsing the rest (see readLocalSchemaHash /
|
|
52
|
+
// readLocalGeneratorVersion).
|
|
52
53
|
sf.addStatements([
|
|
53
54
|
'/* eslint-disable */',
|
|
54
55
|
'// @ts-nocheck',
|
|
55
56
|
'// Auto-generated Strapi API client',
|
|
56
57
|
'// Do not edit manually',
|
|
57
58
|
`export const SCHEMA_HASH = ${JSON.stringify(schemaHash)}`,
|
|
59
|
+
`export const GENERATOR_VERSION = ${JSON.stringify(generatorVersion)}`,
|
|
58
60
|
]);
|
|
59
61
|
// Imports
|
|
60
62
|
sf.addStatements(this.generateImports(schema));
|
|
@@ -71,6 +73,8 @@ export class ClientGenerator {
|
|
|
71
73
|
sf.addStatements(this.generateCollectionAPI());
|
|
72
74
|
// SingleTypeAPI class (static block)
|
|
73
75
|
sf.addStatements(this.generateSingleTypeAPI());
|
|
76
|
+
// UsersPermissionsUserAPI class (flat envelope for /api/users)
|
|
77
|
+
sf.addStatements(this.generateUsersPermissionsUserAPI());
|
|
74
78
|
// Custom API classes (for collections with custom routes)
|
|
75
79
|
if (parsedRoutes) {
|
|
76
80
|
sf.addStatements(this.generateCustomAPIClasses(schema, parsedRoutes));
|
|
@@ -780,6 +784,17 @@ class CollectionAPI<
|
|
|
780
784
|
super(config)
|
|
781
785
|
}
|
|
782
786
|
|
|
787
|
+
// Envelope hooks — standard content types use Strapi's { data } wrapper.
|
|
788
|
+
// Subclasses (e.g. the users-permissions endpoint) override these to send
|
|
789
|
+
// and receive a flat payload instead.
|
|
790
|
+
protected wrapBody(data: any): any {
|
|
791
|
+
return { data }
|
|
792
|
+
}
|
|
793
|
+
|
|
794
|
+
protected unwrap(response: any): any {
|
|
795
|
+
return response?.data
|
|
796
|
+
}
|
|
797
|
+
|
|
783
798
|
// Overload: with populate object → populated return type
|
|
784
799
|
find<const TPopulate extends TPopulateKeys, const TFields extends Exclude<keyof TBase & string, '__typename'> = never>(
|
|
785
800
|
params: { populate: TPopulate } & QueryParams<TBase, TFilters, TPopulate, TFields>,
|
|
@@ -805,7 +820,7 @@ class CollectionAPI<
|
|
|
805
820
|
const query = this.buildQueryString(params)
|
|
806
821
|
const url = \`\${this.config.baseURL}/api/\${this.endpoint}\${query}\`
|
|
807
822
|
const response = await this.request<StrapiResponse<any[]>>(url, {}, nextOptions)
|
|
808
|
-
return response
|
|
823
|
+
return this.unwrap(response)
|
|
809
824
|
}
|
|
810
825
|
|
|
811
826
|
// Overload: with populate object → populated return type
|
|
@@ -864,14 +879,14 @@ class CollectionAPI<
|
|
|
864
879
|
const query = this.buildQueryString(params)
|
|
865
880
|
const url = \`\${this.config.baseURL}/api/\${this.endpoint}/\${documentId}\${query}\`
|
|
866
881
|
const response = await this.request<StrapiResponse<any>>(url, {}, nextOptions)
|
|
867
|
-
return response
|
|
882
|
+
return this.unwrap(response)
|
|
868
883
|
}
|
|
869
884
|
|
|
870
885
|
async create(data: TInput | FormData, nextOptions?: NextOptions): Promise<TBase> {
|
|
871
|
-
//
|
|
886
|
+
// FormData is sent as-is; everything else goes through the envelope hook
|
|
872
887
|
const body = data instanceof FormData
|
|
873
888
|
? data
|
|
874
|
-
: JSON.stringify(
|
|
889
|
+
: JSON.stringify(this.wrapBody(data))
|
|
875
890
|
|
|
876
891
|
const url = \`\${this.config.baseURL}/api/\${this.endpoint}\`
|
|
877
892
|
const response = await this.request<StrapiResponse<TBase>>(
|
|
@@ -882,14 +897,14 @@ class CollectionAPI<
|
|
|
882
897
|
},
|
|
883
898
|
nextOptions
|
|
884
899
|
)
|
|
885
|
-
return response
|
|
900
|
+
return this.unwrap(response)
|
|
886
901
|
}
|
|
887
902
|
|
|
888
903
|
async update(documentId: string, data: TInput | FormData, nextOptions?: NextOptions): Promise<TBase> {
|
|
889
|
-
//
|
|
904
|
+
// FormData is sent as-is; everything else goes through the envelope hook
|
|
890
905
|
const body = data instanceof FormData
|
|
891
906
|
? data
|
|
892
|
-
: JSON.stringify(
|
|
907
|
+
: JSON.stringify(this.wrapBody(data))
|
|
893
908
|
|
|
894
909
|
const url = \`\${this.config.baseURL}/api/\${this.endpoint}/\${documentId}\`
|
|
895
910
|
const response = await this.request<StrapiResponse<TBase>>(
|
|
@@ -900,7 +915,7 @@ class CollectionAPI<
|
|
|
900
915
|
},
|
|
901
916
|
nextOptions
|
|
902
917
|
)
|
|
903
|
-
return response
|
|
918
|
+
return this.unwrap(response)
|
|
904
919
|
}
|
|
905
920
|
|
|
906
921
|
async delete(documentId: string, nextOptions?: NextOptions): Promise<TBase | null> {
|
|
@@ -912,7 +927,7 @@ class CollectionAPI<
|
|
|
912
927
|
},
|
|
913
928
|
nextOptions
|
|
914
929
|
)
|
|
915
|
-
return response
|
|
930
|
+
return this.unwrap(response) ?? null
|
|
916
931
|
}
|
|
917
932
|
}`;
|
|
918
933
|
}
|
|
@@ -976,6 +991,24 @@ class SingleTypeAPI<
|
|
|
976
991
|
)
|
|
977
992
|
return response.data
|
|
978
993
|
}
|
|
994
|
+
}`;
|
|
995
|
+
}
|
|
996
|
+
generateUsersPermissionsUserAPI() {
|
|
997
|
+
return `// Users & Permissions endpoint (/api/users) — sends and receives a flat
|
|
998
|
+
// payload, unlike standard content types which use the { data } envelope
|
|
999
|
+
class UsersPermissionsUserAPI<
|
|
1000
|
+
TBase,
|
|
1001
|
+
TInput = Partial<TBase>,
|
|
1002
|
+
TFilters = Record<string, any>,
|
|
1003
|
+
TPopulateKeys extends Record<string, any> = Record<string, any>
|
|
1004
|
+
> extends CollectionAPI<TBase, TInput, TFilters, TPopulateKeys> {
|
|
1005
|
+
protected wrapBody(data: any): any {
|
|
1006
|
+
return data
|
|
1007
|
+
}
|
|
1008
|
+
|
|
1009
|
+
protected unwrap(response: any): any {
|
|
1010
|
+
return response
|
|
1011
|
+
}
|
|
979
1012
|
}`;
|
|
980
1013
|
}
|
|
981
1014
|
generateCustomAPIClasses(schema, parsedRoutes) {
|
|
@@ -1027,6 +1060,20 @@ ${customMethods}
|
|
|
1027
1060
|
}
|
|
1028
1061
|
return `<${contentType.cleanName}, ${contentType.cleanName}Input, ${contentType.cleanName}Filters>`;
|
|
1029
1062
|
}
|
|
1063
|
+
/**
|
|
1064
|
+
* Pick the API class wired for a content type. The users-permissions user
|
|
1065
|
+
* is special-cased to the flat-envelope class; everything else uses its
|
|
1066
|
+
* custom-route class, SingleTypeAPI, or CollectionAPI.
|
|
1067
|
+
*/
|
|
1068
|
+
resolveContentTypeApiClass(contentType, hasCustomRoutes) {
|
|
1069
|
+
if (contentType.name === 'PluginUsersPermissionsUser') {
|
|
1070
|
+
return 'UsersPermissionsUserAPI';
|
|
1071
|
+
}
|
|
1072
|
+
if (hasCustomRoutes) {
|
|
1073
|
+
return `${contentType.cleanName}API`;
|
|
1074
|
+
}
|
|
1075
|
+
return contentType.kind === 'single' ? 'SingleTypeAPI' : 'CollectionAPI';
|
|
1076
|
+
}
|
|
1030
1077
|
/**
|
|
1031
1078
|
* Compute which entries of `PLUGIN_REGISTRY` should be active for the
|
|
1032
1079
|
* current generation. An entry is skipped if the user has a custom
|
|
@@ -1057,11 +1104,7 @@ ${customMethods}
|
|
|
1057
1104
|
const hasCustomRoutes = parsedRoutes?.byController.has(controllerName) &&
|
|
1058
1105
|
controllerName !== 'auth' &&
|
|
1059
1106
|
controllerName !== 'user';
|
|
1060
|
-
const apiClass = hasCustomRoutes
|
|
1061
|
-
? `${contentType.cleanName}API`
|
|
1062
|
-
: contentType.kind === 'single'
|
|
1063
|
-
? 'SingleTypeAPI'
|
|
1064
|
-
: 'CollectionAPI';
|
|
1107
|
+
const apiClass = this.resolveContentTypeApiClass(contentType, !!hasCustomRoutes);
|
|
1065
1108
|
const propName = toCamelCase(endpoint);
|
|
1066
1109
|
const typeParam = hasCustomRoutes
|
|
1067
1110
|
? ''
|
|
@@ -1081,11 +1124,7 @@ ${customMethods}
|
|
|
1081
1124
|
const hasCustomRoutes = parsedRoutes?.byController.has(controllerName) &&
|
|
1082
1125
|
controllerName !== 'auth' &&
|
|
1083
1126
|
controllerName !== 'user';
|
|
1084
|
-
const apiClass = hasCustomRoutes
|
|
1085
|
-
? `${contentType.cleanName}API`
|
|
1086
|
-
: contentType.kind === 'single'
|
|
1087
|
-
? 'SingleTypeAPI'
|
|
1088
|
-
: 'CollectionAPI';
|
|
1127
|
+
const apiClass = this.resolveContentTypeApiClass(contentType, !!hasCustomRoutes);
|
|
1089
1128
|
const propName = toCamelCase(endpoint);
|
|
1090
1129
|
// Determine final endpoint with plugin prefix
|
|
1091
1130
|
// Plugin content types get prefix by default, unless routes explicitly set prefix: ''
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-generator.js","sourceRoot":"","sources":["../../src/generator/client-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,EAAE,OAAO,EAAc,MAAM,UAAU,CAAA;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAK9D,OAAO,EACH,wBAAwB,EACxB,6BAA6B,GAChC,MAAM,+BAA+B,CAAA;AAEtC;;;;;;GAMG;AACH,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC/C,SAAS,wBAAwB;IAC7B,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAA;IACxE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACzC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CACpB,OAAO,EACP,4CAA4C,CAC/C,CAAA;IACD,OAAO,EAAE;SACJ,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC;SAC7B,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;SACzB,IAAI,EAAE,CAAA;AACf,CAAC;AACD,MAAM,sBAAsB,GAAG,wBAAwB,EAAE,CAAA;AAEzD,MAAM,OAAO,eAAe;IAChB,gBAAgB,CAAkB;IAClC,kBAAkB,CAAoB;IACtC,kBAAkB,CAAoB;IAE9C;QACI,IAAI,CAAC,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAA;QAC9C,IAAI,CAAC,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAA;QAClD,IAAI,CAAC,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAA;IACtD,CAAC;IAED,QAAQ,CACJ,MAAoB,EACpB,SAA4B,EAC5B,UAAkC,EAClC,aAAqB,EAAE;QAEvB,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAA;QAC5D,MAAM,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;QAEhD,uCAAuC;QACvC,IAAI,YAAsC,CAAA;QAE1C,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,YAAY,GAAG,wBAAwB,CAAC,SAAS,CAAC,CAAA;YAClD,MAAM,WAAW,GAAG,6BAA6B,CAC7C,SAAS,EACT,UAAU,CACb,CAAA;YACD,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;QACvD,CAAC;QAED,sEAAsE;QACtE,iEAAiE;QACjE,sDAAsD;QACtD,EAAE,CAAC,aAAa,CAAC;YACb,sBAAsB;YACtB,gBAAgB;YAChB,qCAAqC;YACrC,yBAAyB;YACzB,8BAA8B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE;SAC7D,CAAC,CAAA;QAEF,UAAU;QACV,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAA;QAE9C,mCAAmC;QACnC,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,uBAAuB,EAAE,CAAA;QACxE,IAAI,cAAc,EAAE,CAAC;YACjB,EAAE,CAAC,aAAa,CAAC,cAAc,CAAC,CAAA;QACpC,CAAC;QAED,gBAAgB;QAChB,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QAEhC,aAAa;QACb,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAA;QAE3D,qCAAqC;QACrC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAA;QAE9C,qCAAqC;QACrC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAA;QAE9C,0DAA0D;QAC1D,IAAI,YAAY,EAAE,CAAC;YACf,EAAE,CAAC,aAAa,CACZ,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,YAAY,CAAC,CACtD,CAAA;QACL,CAAC;QAED,iEAAiE;QACjE,MAAM,UAAU,GAAG,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QAC/D,MAAM,UAAU,GAAG,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QAC/D,EAAE,CAAC,aAAa,CACZ,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,UAAU,EAAE,UAAU,CAAC,CACrE,CAAA;QAED,kEAAkE;QAClE,iEAAiE;QACjE,iEAAiE;QACjE,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QACrE,EAAE,CAAC,aAAa,CACZ,IAAI,CAAC,kBAAkB,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAClE,CAAA;QAED,0BAA0B;QAC1B,EAAE,CAAC,aAAa,CACZ,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,YAAY,EAAE,aAAa,CAAC,CACjE,CAAA;QAED,OAAO,EAAE,CAAC,WAAW,EAAE,CAAA;IAC3B,CAAC;IAEO,eAAe,CAAC,MAAoB;QACxC,0FAA0F;QAC1F,MAAM,OAAO,GAAa,EAAE,CAAA;QAC5B,MAAM,aAAa,GAAa,EAAE,CAAA;QAElC,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;YAE1B,6DAA6D;YAC7D,MAAM,oBAAoB,GACtB,EAAE,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;gBACvB,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;gBACnB,EAAE,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;gBACxB,EAAE,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAA;YAE9B,IAAI,oBAAoB,EAAE,CAAC;gBACvB,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,YAAY,CAAC,CAAA;gBACzC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,eAAe,CAAC,CAAA;YAChD,CAAC;YAED,8CAA8C;YAC9C,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,CAAA;YAEpC,0CAA0C;YAC1C,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,SAAS,CAAC,CAAA;QAChD,CAAC;QAED,2BAA2B;QAC3B,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAEzB,0DAA0D;QAC1D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACxB,CAAC;QAED,2EAA2E;QAC3E,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CACnC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,KAAK,MAAM,CAChC,CAAA;YACD,IAAI,MAAM,EAAE,CAAC;gBACT,MAAM,eAAe,GACjB,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;oBAC3B,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;oBACvB,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;oBAC5B,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAA;gBAClC,IAAI,eAAe,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;oBAC5D,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;gBACrC,CAAC;YACL,CAAC;QACL,CAAC;QAED,qEAAqE;QACrE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YACzC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QACrC,CAAC;QAED,2BAA2B;QAC3B,aAAa,CAAC,IAAI,CACd,uBAAuB,EACvB,uBAAuB,EACvB,wBAAwB,EACxB,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,CACrB,CAAA;QAED,OAAO,iBAAiB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;gBAClC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAA;IAC1D,CAAC;IAEO,eAAe,CAAC,EAAc,EAAE,MAAoB;QACxD,2BAA2B;QAC3B,EAAE,CAAC,YAAY,CAAC;YACZ,IAAI,EAAE,gBAAgB;YACtB,UAAU,EAAE,IAAI;YAChB,cAAc,EAAE,CAAC,GAAG,CAAC;YACrB,UAAU,EAAE;gBACR,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE;gBAC3B;oBACI,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,uFAAuF;oBAC7F,gBAAgB,EAAE,IAAI;iBACzB;aACJ;SACJ,CAAC,CAAA;QAEF,qEAAqE;QACrE,IAAI,CAAC,iCAAiC,CAAC,EAAE,CAAC,CAAA;QAC1C,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAA;QAE5B,oBAAoB;QACpB,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAA;QAE5B,8BAA8B;QAC9B,IAAI,CAAC,6BAA6B,CAAC,EAAE,CAAC,CAAA;QAEtC,mEAAmE;QACnE,wDAAwD;QACxD,IAAI,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAA;QAEjC,yCAAyC;QACzC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAA;QAE7C,8BAA8B;QAC9B,EAAE,CAAC,YAAY,CAAC;YACZ,IAAI,EAAE,kBAAkB;YACxB,cAAc,EAAE,CAAC,GAAG,CAAC;YACrB,IAAI,EAAE,8GAA8G;SACvH,CAAC,CAAA;QAEF,wBAAwB;QACxB,EAAE,CAAC,YAAY,CAAC;YACZ,IAAI,EAAE,aAAa;YACnB,UAAU,EAAE,IAAI;YAChB,cAAc,EAAE;gBACZ,eAAe;gBACf,gCAAgC;gBAChC,iBAAiB;gBACjB,wEAAwE;aAC3E;YACD,UAAU,EAAE;gBACR;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,UAAU;oBAChB,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,yDAAyD;oBAC/D,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,YAAY;oBAClB,IAAI,EAAE,sEAAsE;oBAC5E,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,WAAW;oBACjB,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,WAAW;oBACjB,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,QAAQ;oBACd,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,uBAAuB;oBAC7B,gBAAgB,EAAE,IAAI;iBACzB;aACJ;SACJ,CAAC,CAAA;QAEF,uEAAuE;QACvE,sEAAsE;QACtE,qEAAqE;QACrE,gCAAgC;QAChC,EAAE,CAAC,YAAY,CAAC;YACZ,IAAI,EAAE,mBAAmB;YACzB,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE;gBACF,uDAAuD;oBACnD,+DAA+D;oBAC/D,8DAA8D;oBAC9D,8DAA8D;oBAC9D,mBAAmB;aAC1B;YACD,UAAU,EAAE;gBACR;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,qBAAqB;oBAC3B,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,6DAA6D;oBACnE,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,qDAAqD;oBAC3D,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,QAAQ;oBACd,gBAAgB,EAAE,IAAI;oBACtB,IAAI,EAAE;wBACF,6EAA6E;qBAChF;iBACJ;gBACD;oBACI,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,QAAQ;oBACd,gBAAgB,EAAE,IAAI;oBACtB,IAAI,EAAE;wBACF,yEAAyE;qBAC5E;iBACJ;aACJ;SACJ,CAAC,CAAA;QAEF,wBAAwB;QACxB,EAAE,CAAC,YAAY,CAAC;YACZ,IAAI,EAAE,aAAa;YACnB,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE;gBACR;oBACI,IAAI,EAAE,YAAY;oBAClB,IAAI,EAAE,gBAAgB;oBACtB,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,UAAU;oBAChB,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,cAAc;oBACpB,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,oCAAoC;oBAC1C,gBAAgB,EAAE,IAAI;iBACzB;aACJ;SACJ,CAAC,CAAA;QAEF,+BAA+B;QAC/B,EAAE,CAAC,YAAY,CAAC;YACZ,IAAI,EAAE,oBAAoB;YAC1B,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE;gBACR,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;gBACnC;oBACI,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,QAAQ;oBACd,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,cAAc;oBACpB,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,SAAS;oBACf,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,aAAa;oBACnB,IAAI,EAAE,oBAAoB;oBAC1B,gBAAgB,EAAE,IAAI;iBACzB;gBACD;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,QAAQ;oBACd,gBAAgB,EAAE,IAAI;oBACtB,IAAI,EAAE;wBACF,uFAAuF;qBAC1F;iBACJ;gBACD;oBACI,IAAI,EAAE,gBAAgB;oBACtB,IAAI,EAAE,SAAS;oBACf,gBAAgB,EAAE,IAAI;oBACtB,IAAI,EAAE;wBACF,kFAAkF;qBACrF;iBACJ;aACJ;SACJ,CAAC,CAAA;QAEF,qBAAqB;QACrB,EAAE,CAAC,YAAY,CAAC;YACZ,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,CAAC,4CAA4C,CAAC;YACpD,cAAc,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;YAC1B,IAAI,EAAE,sFAAsF;SAC/F,CAAC,CAAA;QAEF,0DAA0D;QAC1D,IAAI,CAAC,mBAAmB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QAEpC,4BAA4B;QAC5B,EAAE,CAAC,YAAY,CAAC;YACZ,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE;gBACF,kEAAkE;aACrE;YACD,cAAc,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,wBAAwB,CAAC;YAC5D,IAAI,EAAE,iIAAiI;SAC1I,CAAC,CAAA;IACN,CAAC;IAEO,iCAAiC,CAAC,EAAc;QACpD,EAAE,CAAC,YAAY,CAAC;YACZ,IAAI,EAAE,uBAAuB;YAC7B,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE;gBACF,yDAAyD;oBACrD,wEAAwE;aAC/E;YACD,UAAU,EAAE;gBACR;oBACI,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE;wBACF,+DAA+D;qBAClE;iBACJ;gBACD,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;gBACnC;oBACI,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,2CAA2C,CAAC;iBACtD;aACJ;SACJ,CAAC,CAAA;IACN,CAAC;IAEO,mBAAmB,CAAC,EAAc;QACtC,MAAM,KAAK,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,CAAA;QAChE,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAEpC,EAAE,CAAC,YAAY,CAAC;YACZ,IAAI,EAAE,iBAAiB;YACvB,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE;gBACF,oEAAoE;oBAChE,wEAAwE;oBACxE,sBAAsB;aAC7B;YACD,IAAI,EAAE,GAAG,UAAU,kBAAkB;SACxC,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CACxC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,WAAW,EAAE,CAC5C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEZ,EAAE,CAAC,YAAY,CAAC;YACZ,IAAI,EAAE,uBAAuB;YAC7B,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE;gBACF,mEAAmE;oBAC/D,oEAAoE;oBACpE,gEAAgE;oBAChE,mDAAmD;aAC1D;YACD,IAAI,EAAE,cAAc,UAAU,MAAM;SACvC,CAAC,CAAA;QAEF,EAAE,CAAC,YAAY,CAAC;YACZ,IAAI,EAAE,2BAA2B;YACjC,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE;gBACF,qEAAqE;oBACjE,2EAA2E;aAClF;YACD,UAAU,EAAE;gBACR,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE;gBACrC;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,yBAAyB;oBAC/B,gBAAgB,EAAE,IAAI;iBACzB;aACJ;SACJ,CAAC,CAAA;IACN,CAAC;IAEO,mBAAmB,CAAC,EAAc;QACtC,EAAE,CAAC,QAAQ,CAAC;YACR,IAAI,EAAE,aAAa;YACnB,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE;gBACF,qDAAqD;oBACjD,+DAA+D;oBAC/D,mDAAmD;oBACnD,YAAY;oBACZ,SAAS;oBACT,uDAAuD;oBACvD,eAAe;oBACf,kDAAkD;oBAClD,sDAAsD;oBACtD,0DAA0D;oBAC1D,SAAS;oBACT,OAAO;oBACP,KAAK;oBACL,KAAK;aACZ;YACD,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE;gBACR;oBACI,IAAI,EAAE,aAAa;oBACnB,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,iDAAiD,CAAC;iBAC5D;gBACD;oBACI,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,kBAAkB,CAAC;iBAC7B;gBACD;oBACI,IAAI,EAAE,YAAY;oBAClB,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,kBAAkB,CAAC;iBAC7B;gBACD;oBACI,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,iBAAiB;oBACvB,IAAI,EAAE;wBACF,mEAAmE;4BAC/D,oEAAoE;4BACpE,oEAAoE;qBAC3E;iBACJ;gBACD;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,SAAS;oBACf,gBAAgB,EAAE,IAAI;oBACtB,IAAI,EAAE;wBACF,8DAA8D;4BAC1D,gDAAgD;qBACvD;iBACJ;aACJ;YACD,KAAK,EAAE;gBACH;oBACI,UAAU,EAAE;wBACR,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACnC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACvC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;wBAClC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACtC;4BACI,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,SAAS;4BACf,gBAAgB,EAAE,IAAI;yBACzB;wBACD;4BACI,IAAI,EAAE,WAAW;4BACjB,IAAI,EAAE,iBAAiB;4BACvB,WAAW,EAAE,gBAAgB;yBAChC;qBACJ;oBACD,UAAU,EAAE;wBACR,gBAAgB;wBAChB,2BAA2B;wBAC3B,gCAAgC;wBAChC,sBAAsB;wBACtB,8BAA8B;wBAC9B,4BAA4B;wBAC5B,wBAAwB;qBAC3B;iBACJ;aACJ;SACJ,CAAC,CAAA;IACN,CAAC;IAEO,wBAAwB,CAAC,EAAc;QAC3C,EAAE,CAAC,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;CAuBxB,CAAC,CAAA;IACE,CAAC;IAEO,6BAA6B,CAAC,EAAc;QAChD,EAAE,CAAC,QAAQ,CAAC;YACR,IAAI,EAAE,uBAAuB;YAC7B,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE;gBACF,yFAAyF;aAC5F;YACD,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE;gBACR;oBACI,IAAI,EAAE,KAAK;oBACX,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,kCAAkC,CAAC;iBAC7C;gBACD;oBACI,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,OAAO;oBACb,gBAAgB,EAAE,IAAI;oBACtB,IAAI,EAAE;wBACF,uDAAuD;qBAC1D;iBACJ;aACJ;YACD,KAAK,EAAE;gBACH;oBACI,UAAU,EAAE;wBACR,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACnC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE;wBAC/B;4BACI,IAAI,EAAE,OAAO;4BACb,IAAI,EAAE,OAAO;4BACb,gBAAgB,EAAE,IAAI;yBACzB;qBACJ;oBACD,UAAU,EAAE;wBACR,gBAAgB;wBAChB,qCAAqC;wBACrC,gBAAgB;wBAChB,oBAAoB;qBACvB;iBACJ;aACJ;SACJ,CAAC,CAAA;IACN,CAAC;IAEO,oBAAoB;QACxB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoKb,sBAAsB,EAAE,CAAA;IACtB,CAAC;IAEO,mBAAmB,CAAC,EAAc,EAAE,MAAoB;QAC5D,MAAM,gBAAgB,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAC/C,EAAE,CAAC,EAAE,CACD,EAAE,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;YACvB,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;YACnB,EAAE,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;YACxB,EAAE,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CACjC,CAAA;QAED,MAAM,mBAAmB,GAAG,gBAAgB;aACvC,GAAG,CACA,EAAE,CAAC,EAAE,CACD,gBAAgB,EAAE,CAAC,SAAS,oBAAoB,EAAE,CAAC,SAAS,uCAAuC,CAC1G;aACA,IAAI,CAAC,MAAM,CAAC,CAAA;QAEjB,EAAE,CAAC,YAAY,CAAC;YACZ,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE;gBACF,iJAAiJ;aACpJ;YACD,cAAc,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC;YACtC,IAAI,EAAE,mBAAmB;gBACrB,CAAC,CAAC,GAAG,mBAAmB,WAAW;gBACnC,CAAC,CAAC,OAAO;SAChB,CAAC,CAAA;IACN,CAAC;IAEO,qBAAqB;QACzB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoJb,CAAA;IACE,CAAC;IAEO,qBAAqB;QACzB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2Db,CAAA;IACE,CAAC;IAEO,wBAAwB,CAC5B,MAAoB,EACpB,YAA0B;QAE1B,MAAM,OAAO,GAAa,EAAE,CAAA;QAE5B,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,YAAY,CAAC,YAAY,EAAE,CAAC;YAC3D,8DAA8D;YAC9D,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;gBACjD,SAAQ;YACZ,CAAC;YAED,mFAAmF;YACnF,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CACxC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,KAAK,UAAU,CACvC,CAAA;YAED,IAAI,WAAW,EAAE,CAAC;gBACd,MAAM,SAAS,GAAG,GAAG,WAAW,CAAC,SAAS,KAAK,CAAA;gBAC/C,MAAM,SAAS,GACX,WAAW,CAAC,IAAI,KAAK,QAAQ;oBACzB,CAAC,CAAC,eAAe;oBACjB,CAAC,CAAC,eAAe,CAAA;gBACzB,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;gBACpD,MAAM,QAAQ,GACV,WAAW,CAAC,IAAI,KAAK,QAAQ;oBACzB,CAAC,CAAC,WAAW,CAAC,YAAY;oBAC1B,CAAC,CAAC,WAAW,CAAC,UAAU,CAAA;gBAChC,MAAM,aAAa,GACf,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,CACzC,UAAU,EACV,MAAM,EACN,KAAK,EACL,QAAQ,CACX,CAAA;gBAEL,OAAO,CAAC,IAAI,CACR,2BAA2B,WAAW,CAAC,SAAS,KAAK,WAAW,CAAC,IAAI;QACjF,SAAS,YAAY,SAAS,GAAG,UAAU;EACjD,aAAa;EACb,CACe,CAAA;YACL,CAAC;iBAAM,CAAC;gBACJ,yCAAyC;gBACzC,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,sBAAsB,CAC7C,UAAU,EACV,MAAM,EACN,MAAM,CACT,CAAA;gBACD,MAAM,aAAa,GACf,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,CACzC,UAAU,EACV,MAAM,EACN,IAAI,CACP,CAAA;gBAEL,OAAO,CAAC,IAAI,CACR,+BAA+B,UAAU;QACrD,SAAS;;;;EAIf,aAAa;EACb,CACe,CAAA;YACL,CAAC;QACL,CAAC;QAED,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC/B,CAAC;IAEO,eAAe,CAAC,WAAwB;QAC5C,MAAM,oBAAoB,GACtB,WAAW,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;YAChC,WAAW,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;YAC5B,WAAW,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;YACjC,WAAW,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAA;QAEvC,IAAI,oBAAoB,EAAE,CAAC;YACvB,OAAO,IAAI,WAAW,CAAC,SAAS,KAAK,WAAW,CAAC,SAAS,UAAU,WAAW,CAAC,SAAS,YAAY,WAAW,CAAC,SAAS,gBAAgB,CAAA;QAC9I,CAAC;QACD,OAAO,IAAI,WAAW,CAAC,SAAS,KAAK,WAAW,CAAC,SAAS,UAAU,WAAW,CAAC,SAAS,UAAU,CAAA;IACvG,CAAC;IAED;;;;;;OAMG;IACK,oBAAoB,CACxB,MAAoB,EACpB,YAA2B;QAE3B,OAAO,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YACrC,MAAM,0BAA0B,GAC5B,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC;gBACvD,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CACrB,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,KAAK,QAAQ,CAAC,cAAc,CACpD,CAAA;YACL,IAAI,0BAA0B,EAAE,CAAC;gBAC7B,OAAO,CAAC,IAAI,CACR,0BAA0B,QAAQ,CAAC,cAAc,0BAA0B;oBACvE,qBAAqB,QAAQ,CAAC,SAAS,2BAA2B,CACzE,CAAA;gBACD,OAAO,KAAK,CAAA;YAChB,CAAC;YACD,OAAO,IAAI,CAAA;QACf,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,oBAAoB,CACxB,MAAoB,EACpB,YAA2B,EAC3B,gBAAwC,eAAe;QAEvD,8BAA8B;QAC9B,MAAM,oBAAoB,GAAG,MAAM,CAAC,YAAY;aAC3C,GAAG,CAAC,WAAW,CAAC,EAAE;YACf,MAAM,QAAQ,GACV,WAAW,CAAC,IAAI,KAAK,QAAQ;gBACzB,CAAC,CAAC,WAAW,CAAC,YAAY;gBAC1B,CAAC,CAAC,WAAW,CAAC,UAAU,CAAA;YAChC,MAAM,cAAc,GAAG,WAAW,CAAC,YAAY,CAAA;YAC/C,MAAM,eAAe,GACjB,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC;gBAC9C,cAAc,KAAK,MAAM;gBACzB,cAAc,KAAK,MAAM,CAAA;YAC7B,MAAM,QAAQ,GAAG,eAAe;gBAC5B,CAAC,CAAC,GAAG,WAAW,CAAC,SAAS,KAAK;gBAC/B,CAAC,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ;oBAC7B,CAAC,CAAC,eAAe;oBACjB,CAAC,CAAC,eAAe,CAAA;YACvB,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;YACtC,MAAM,SAAS,GAAG,eAAe;gBAC7B,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;YACvC,OAAO,KAAK,QAAQ,KAAK,QAAQ,GAAG,SAAS,EAAE,CAAA;QACnD,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAA;QAEf,6CAA6C;QAC7C,MAAM,sBAAsB,GAAG,IAAI,CAAC,2BAA2B,CAC3D,MAAM,EACN,YAAY,CACf,CAAA;QAED,oCAAoC;QACpC,MAAM,aAAa,GAAG,MAAM,CAAC,YAAY;aACpC,GAAG,CAAC,WAAW,CAAC,EAAE;YACf,MAAM,QAAQ,GACV,WAAW,CAAC,IAAI,KAAK,QAAQ;gBACzB,CAAC,CAAC,WAAW,CAAC,YAAY;gBAC1B,CAAC,CAAC,WAAW,CAAC,UAAU,CAAA;YAChC,MAAM,cAAc,GAAG,WAAW,CAAC,YAAY,CAAA;YAC/C,MAAM,eAAe,GACjB,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC;gBAC9C,cAAc,KAAK,MAAM;gBACzB,cAAc,KAAK,MAAM,CAAA;YAC7B,MAAM,QAAQ,GAAG,eAAe;gBAC5B,CAAC,CAAC,GAAG,WAAW,CAAC,SAAS,KAAK;gBAC/B,CAAC,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ;oBAC7B,CAAC,CAAC,eAAe;oBACjB,CAAC,CAAC,eAAe,CAAA;YACvB,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;YAEtC,8CAA8C;YAC9C,sFAAsF;YACtF,IAAI,aAAa,GAAG,QAAQ,CAAA;YAC5B,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC;gBACzB,MAAM,gBAAgB,GAClB,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;gBAClD,MAAM,cAAc,GAAG,gBAAgB,EAAE,IAAI,CACzC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,EAAE,CACvB,CAAA;gBACD,IAAI,CAAC,cAAc,EAAE,CAAC;oBAClB,aAAa,GAAG,GAAG,WAAW,CAAC,UAAU,IAAI,QAAQ,EAAE,CAAA;gBAC3D,CAAC;YACL,CAAC;YAED,OAAO,YAAY,QAAQ,UAAU,QAAQ,KAAK,aAAa,iBAAiB,CAAA;QACpF,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAA;QAEf,uCAAuC;QACvC,MAAM,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QAEvE,oEAAoE;QACpE,iEAAiE;QACjE,0DAA0D;QAC1D,MAAM,kBAAkB,GAAG,aAAa;aACnC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,cAAc,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;aACjD,IAAI,CAAC,IAAI,CAAC,CAAA;QAEf,MAAM,WAAW,GAAG,aAAa;aAC5B,GAAG,CACA,CAAC,CAAC,EAAE,CACA,YAAY,CAAC,CAAC,cAAc,UAAU,CAAC,CAAC,SAAS,eAAe,CACvE;aACA,IAAI,CAAC,IAAI,CAAC,CAAA;QAEf,MAAM,uBAAuB,GAAG,kBAAkB;YAC9C,CAAC,CAAC,yCAAyC,kBAAkB,IAAI;YACjE,CAAC,CAAC,EAAE,CAAA;QACR,MAAM,gBAAgB,GAAG,WAAW;YAChC,CAAC,CAAC,oCAAoC,WAAW,IAAI;YACrD,CAAC,CAAC,EAAE,CAAA;QAER,OAAO;;;;;;EAMb,uBAAuB;EACvB,oBAAoB;EACpB,sBAAsB;;;;;;EAMtB,gBAAgB;EAChB,aAAa;EACb,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuDf,CAAA;IACE,CAAC;IAED;;;;;;;;;;;OAWG;IACK,sBAAsB,CAC1B,UAAkB,EAClB,MAAqB,EACrB,MAAoB;QAEpB,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CACrC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,KAAK,UAAU,CACrC,CAAA;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,UAAU,CAAA;QAE7D,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;YACzB,OAAO;gBACH,SAAS,EACL,YAAY,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC,GAAG,KAAK;gBAC/D,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC;aAC/D,CAAA;QACL,CAAC;QAED,OAAO;YACH,SAAS,EAAE,YAAY,CAAC,UAAU,CAAC,GAAG,KAAK;YAC3C,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC;SACpC,CAAA;IACL,CAAC;IAEO,2BAA2B,CAC/B,MAAoB,EACpB,YAA2B;QAE3B,IAAI,CAAC,YAAY;YAAE,OAAO,EAAE,CAAA;QAE5B,MAAM,YAAY,GAAa,EAAE,CAAA;QACjC,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,YAAY,CAAC,YAAY,EAAE,CAAC;YAC3D,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,MAAM;gBAAE,SAAQ;YAE5D,MAAM,cAAc,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAC3C,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,KAAK,UAAU,CACvC,CAAA;YAED,IAAI,CAAC,cAAc,EAAE,CAAC;gBAClB,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,sBAAsB,CACvD,UAAU,EACV,MAAM,EACN,MAAM,CACT,CAAA;gBACD,YAAY,CAAC,IAAI,CAAC,KAAK,QAAQ,KAAK,SAAS,EAAE,CAAC,CAAA;YACpD,CAAC;QACL,CAAC;QAED,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;IAEO,oBAAoB,CACxB,MAAoB,EACpB,YAA2B;QAE3B,IAAI,CAAC,YAAY;YAAE,OAAO,EAAE,CAAA;QAE5B,MAAM,KAAK,GAAa,EAAE,CAAA;QAC1B,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,YAAY,CAAC,YAAY,EAAE,CAAC;YAC3D,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,MAAM;gBAAE,SAAQ;YAE5D,MAAM,cAAc,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAC3C,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,KAAK,UAAU,CACvC,CAAA;YAED,IAAI,CAAC,cAAc,EAAE,CAAC;gBAClB,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,sBAAsB,CACvD,UAAU,EACV,MAAM,EACN,MAAM,CACT,CAAA;gBACD,KAAK,CAAC,IAAI,CACN,YAAY,QAAQ,UAAU,SAAS,eAAe,CACzD,CAAA;YACL,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC3B,CAAC;CACJ"}
|
|
1
|
+
{"version":3,"file":"client-generator.js","sourceRoot":"","sources":["../../src/generator/client-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export declare class Generator {
|
|
|
6
6
|
private clientGenerator;
|
|
7
7
|
private indexGenerator;
|
|
8
8
|
constructor(outputDir: string);
|
|
9
|
-
generate(schema: ParsedSchema, endpoints?: ParsedEndpoint[], extraTypes?: ExtraControllerType[], schemaHash?: string, format?: 'js' | 'ts'): Promise<void>;
|
|
9
|
+
generate(schema: ParsedSchema, endpoints?: ParsedEndpoint[], extraTypes?: ExtraControllerType[], schemaHash?: string, generatorVersion?: string, format?: 'js' | 'ts'): Promise<void>;
|
|
10
10
|
private formatContent;
|
|
11
11
|
private compileFiles;
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAIjD,OAAO,KAAK,EACR,cAAc,EACd,mBAAmB,EACtB,MAAM,6BAA6B,CAAA;AASpC,qBAAa,SAAS;IAClB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,cAAc,CAAgB;gBAE1B,SAAS,EAAE,MAAM;IAOvB,QAAQ,CACV,MAAM,EAAE,YAAY,EACpB,SAAS,CAAC,EAAE,cAAc,EAAE,EAC5B,UAAU,CAAC,EAAE,mBAAmB,EAAE,EAClC,UAAU,GAAE,MAAW,EACvB,MAAM,GAAE,IAAI,GAAG,IAAW,GAC3B,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAIjD,OAAO,KAAK,EACR,cAAc,EACd,mBAAmB,EACtB,MAAM,6BAA6B,CAAA;AASpC,qBAAa,SAAS;IAClB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,cAAc,CAAgB;gBAE1B,SAAS,EAAE,MAAM;IAOvB,QAAQ,CACV,MAAM,EAAE,YAAY,EACpB,SAAS,CAAC,EAAE,cAAc,EAAE,EAC5B,UAAU,CAAC,EAAE,mBAAmB,EAAE,EAClC,UAAU,GAAE,MAAW,EACvB,gBAAgB,GAAE,MAAW,EAC7B,MAAM,GAAE,IAAI,GAAG,IAAW,GAC3B,OAAO,CAAC,IAAI,CAAC;YA4CF,aAAa;YAgBb,YAAY;CA2D7B"}
|
package/dist/generator/index.js
CHANGED
|
@@ -18,14 +18,14 @@ export class Generator {
|
|
|
18
18
|
this.clientGenerator = new ClientGenerator();
|
|
19
19
|
this.indexGenerator = new IndexGenerator();
|
|
20
20
|
}
|
|
21
|
-
async generate(schema, endpoints, extraTypes, schemaHash = '', format = 'js') {
|
|
21
|
+
async generate(schema, endpoints, extraTypes, schemaHash = '', generatorVersion = '', format = 'js') {
|
|
22
22
|
// Ensure output directory exists
|
|
23
23
|
if (!fs.existsSync(this.outputDir)) {
|
|
24
24
|
fs.mkdirSync(this.outputDir, { recursive: true });
|
|
25
25
|
}
|
|
26
26
|
// Generate all source contents
|
|
27
27
|
const typesContent = this.typesGenerator.generate(schema);
|
|
28
|
-
const clientContent = this.clientGenerator.generate(schema, endpoints, extraTypes, schemaHash);
|
|
28
|
+
const clientContent = this.clientGenerator.generate(schema, endpoints, extraTypes, schemaHash, generatorVersion);
|
|
29
29
|
const indexContent = this.indexGenerator.generate();
|
|
30
30
|
// Format all files with prettier
|
|
31
31
|
const files = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,KAAK,EAAE,MAAM,YAAY,CAAA;AAEhC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAMrD,SAAS,sBAAsB,CAAC,MAAc;IAC1C,OAAO,MAAM,CAAC,OAAO,CACjB,8DAA8D,EAC9D,QAAQ,CACX,CAAA;AACL,CAAC;AAED,MAAM,OAAO,SAAS;IACV,SAAS,CAAQ;IACjB,cAAc,CAAgB;IAC9B,eAAe,CAAiB;IAChC,cAAc,CAAgB;IAEtC,YAAY,SAAiB;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,EAAE,CAAA;QAC1C,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC5C,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,EAAE,CAAA;IAC9C,CAAC;IAED,KAAK,CAAC,QAAQ,CACV,MAAoB,EACpB,SAA4B,EAC5B,UAAkC,EAClC,aAAqB,EAAE,EACvB,SAAsB,IAAI;QAE1B,iCAAiC;QACjC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACjC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACrD,CAAC;QAED,+BAA+B;QAC/B,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACzD,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAC/C,MAAM,EACN,SAAS,EACT,UAAU,EACV,UAAU,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":"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"}
|
package/dist/next/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/next/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAOH,MAAM,WAAW,iBAAiB;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/next/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAOH,MAAM,WAAW,iBAAiB;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB;AAoQD,wBAAgB,eAAe,CAAC,MAAM,CAAC,EAAE,iBAAiB,IAC9C,CAAC,EAAE,YAAY,CAAC,KAAG,CAAC,CAgB/B"}
|
package/dist/next/index.js
CHANGED
|
@@ -176,15 +176,17 @@ function runBuildGenerate(config) {
|
|
|
176
176
|
if (token) {
|
|
177
177
|
args.push('--token', token);
|
|
178
178
|
}
|
|
179
|
+
const stop = loading(silent, 'Generating types');
|
|
180
|
+
const start = Date.now();
|
|
179
181
|
try {
|
|
180
|
-
|
|
181
|
-
const start = Date.now();
|
|
182
|
-
execFileSync('node', args, { stdio: 'ignore' });
|
|
182
|
+
execFileSync('node', args, { stdio: ['ignore', 'ignore', 'pipe'] });
|
|
183
183
|
stop();
|
|
184
184
|
ok(silent, `Types generated in ${dim(`${Date.now() - start}ms`)}`);
|
|
185
185
|
}
|
|
186
|
-
catch {
|
|
187
|
-
|
|
186
|
+
catch (error) {
|
|
187
|
+
stop();
|
|
188
|
+
const stderr = error.stderr?.toString().trim();
|
|
189
|
+
fail(`Failed to generate types, using existing if available${stderr ? `\n${stderr}` : ''}`);
|
|
188
190
|
}
|
|
189
191
|
}
|
|
190
192
|
/**
|
package/dist/next/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/next/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/next/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/server/src/controllers/schema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,MAAM,WAAW,aAAa;IAC1B,KAAK,EAAE;QACH,IAAI,CAAC,EAAE,OAAO,CAAA;KACjB,CAAA;IACD,OAAO,EAAE;QACL,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;KAC7C,CAAA;IACD,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IACvC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACzC,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,OAAO,CAAA;IACb,GAAG,EAAE;QACD,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAA;KACpD,CAAA;CACJ;AAED,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE;QACJ,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;KACxD,CAAA;IACD,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;QACtB,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;YACvB,SAAS,EAAE,MAAM,OAAO,CAAA;YACxB,aAAa,EAAE,MAAM,OAAO,CAAA;SAC/B,CAAA;KACJ,CAAA;IACD,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAA;IAC7B,GAAG,EAAE;QACD,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;KACpD,CAAA;CACJ;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/server/src/controllers/schema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,MAAM,WAAW,aAAa;IAC1B,KAAK,EAAE;QACH,IAAI,CAAC,EAAE,OAAO,CAAA;KACjB,CAAA;IACD,OAAO,EAAE;QACL,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;KAC7C,CAAA;IACD,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IACvC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACzC,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,OAAO,CAAA;IACb,GAAG,EAAE;QACD,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAA;KACpD,CAAA;CACJ;AAED,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE;QACJ,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;KACxD,CAAA;IACD,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;QACtB,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;YACvB,SAAS,EAAE,MAAM,OAAO,CAAA;YACxB,aAAa,EAAE,MAAM,OAAO,CAAA;SAC/B,CAAA;KACJ,CAAA;IACD,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAA;IAC7B,GAAG,EAAE;QACD,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;QACjD,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;KACpD,CAAA;CACJ;yBAoCe,YAAY;IAAE,MAAM,EAAE,cAAc,CAAA;CAAE;IAClD;;;OAGG;mBACkB,aAAa;IA4BlC;;;OAGG;uBACsB,aAAa;IA4BtC;;;;;OAKG;qBACoB,aAAa;;AAvExC,wBA6HE"}
|
|
@@ -20,10 +20,13 @@ async function validateApiToken(strapi, ctx) {
|
|
|
20
20
|
try {
|
|
21
21
|
const apiTokenService = strapi.service('admin::api-token');
|
|
22
22
|
const accessKey = await apiTokenService.hash(token);
|
|
23
|
-
const storedToken =
|
|
23
|
+
const storedToken = typeof apiTokenService.getByAccessKey === 'function'
|
|
24
|
+
? await apiTokenService.getByAccessKey(accessKey)
|
|
25
|
+
: await apiTokenService.getBy({ accessKey });
|
|
24
26
|
return !!storedToken;
|
|
25
27
|
}
|
|
26
|
-
catch {
|
|
28
|
+
catch (error) {
|
|
29
|
+
strapi.log?.warn?.('[strapi-typed-client] token validation failed', error);
|
|
27
30
|
return false;
|
|
28
31
|
}
|
|
29
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../src/plugin/server/src/controllers/schema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../src/plugin/server/src/controllers/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Resolve the installed generator (package) version from the package's own
|
|
3
|
+
* package.json, so the value matches the published version exactly. Node-only
|
|
4
|
+
* helper — do not import from the shared barrel (keeps fs out of browser bundles).
|
|
5
|
+
*
|
|
6
|
+
* @module shared/version
|
|
7
|
+
*/
|
|
8
|
+
export declare function getGeneratorVersion(): string;
|
|
9
|
+
//# sourceMappingURL=version.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/shared/version.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAQH,wBAAgB,mBAAmB,IAAI,MAAM,CAc5C"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Resolve the installed generator (package) version from the package's own
|
|
3
|
+
* package.json, so the value matches the published version exactly. Node-only
|
|
4
|
+
* helper — do not import from the shared barrel (keeps fs out of browser bundles).
|
|
5
|
+
*
|
|
6
|
+
* @module shared/version
|
|
7
|
+
*/
|
|
8
|
+
import { readFileSync } from 'fs';
|
|
9
|
+
import { fileURLToPath } from 'url';
|
|
10
|
+
import * as path from 'path';
|
|
11
|
+
let cached;
|
|
12
|
+
export function getGeneratorVersion() {
|
|
13
|
+
if (cached !== undefined)
|
|
14
|
+
return cached;
|
|
15
|
+
let version = '';
|
|
16
|
+
try {
|
|
17
|
+
const dir = path.dirname(fileURLToPath(import.meta.url));
|
|
18
|
+
const pkg = JSON.parse(readFileSync(path.join(dir, '../../package.json'), 'utf-8'));
|
|
19
|
+
if (typeof pkg.version === 'string')
|
|
20
|
+
version = pkg.version;
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
// ignore — fall back to empty version
|
|
24
|
+
}
|
|
25
|
+
cached = version;
|
|
26
|
+
return version;
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=version.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/shared/version.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AACnC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAE5B,IAAI,MAA0B,CAAA;AAE9B,MAAM,UAAU,mBAAmB;IAC/B,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAA;IACvC,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QACxD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAClB,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC,CAC9D,CAAA;QACD,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ;YAAE,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC9D,CAAC;IAAC,MAAM,CAAC;QACL,sCAAsC;IAC1C,CAAC;IACD,MAAM,GAAG,OAAO,CAAA;IAChB,OAAO,OAAO,CAAA;AAClB,CAAC"}
|