@openapi-qraft/openapi-typescript-plugin 1.2.0-next.1 → 1.2.0-next.10

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.
Files changed (6) hide show
  1. package/CHANGELOG.md +57 -0
  2. package/dist/lib/createExportsForComponentSchemas.d.ts.map +1 -1
  3. package/dist/lib/createExportsForComponentSchemas.js +9 -3
  4. package/dist/lib/createExportsForComponentSchemas.js.map +1 -1
  5. package/package.json +8 -8
  6. package/src/lib/createExportsForComponentSchemas.ts +19 -8
package/CHANGELOG.md CHANGED
@@ -1,5 +1,62 @@
1
1
  # @openapi-qraft/openapi-typescript
2
2
 
3
+ ## 1.2.0-next.10
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies [8c77eb2]
8
+ - @openapi-qraft/plugin@2.0.0-next.10
9
+
10
+ ## 1.2.0-next.9
11
+
12
+ ### Patch Changes
13
+
14
+ - 9dc1918: Simplified `TParams` type for conditional expressions.
15
+ - @openapi-qraft/plugin@2.0.0-next.9
16
+
17
+ ## 1.2.0-next.8
18
+
19
+ ### Patch Changes
20
+
21
+ - @openapi-qraft/plugin@2.0.0-next.8
22
+
23
+ ## 1.2.0-next.7
24
+
25
+ ### Patch Changes
26
+
27
+ - @openapi-qraft/plugin@2.0.0-next.7
28
+
29
+ ## 1.2.0-next.6
30
+
31
+ ### Patch Changes
32
+
33
+ - @openapi-qraft/plugin@2.0.0-next.6
34
+
35
+ ## 1.2.0-next.5
36
+
37
+ ### Patch Changes
38
+
39
+ - @openapi-qraft/plugin@2.0.0-next.5
40
+
41
+ ## 1.2.0-next.4
42
+
43
+ ### Patch Changes
44
+
45
+ - cd8a856: Resolved conflict between explicit exports and generated enum exports by aligning export strategy.
46
+ - @openapi-qraft/plugin@2.0.0-next.4
47
+
48
+ ## 1.2.0-next.3
49
+
50
+ ### Patch Changes
51
+
52
+ - @openapi-qraft/plugin@2.0.0-next.3
53
+
54
+ ## 1.2.0-next.2
55
+
56
+ ### Patch Changes
57
+
58
+ - @openapi-qraft/plugin@2.0.0-next.2
59
+
3
60
  ## 1.2.0-next.1
4
61
 
5
62
  ### Minor Changes
package/dist/lib/createExportsForComponentSchemas.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createExportsForComponentSchemas.d.ts","sourceRoot":"","sources":["../../src/lib/createExportsForComponentSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,6BA6C9D;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,YAa9C"}
1
+ {"version":3,"file":"createExportsForComponentSchemas.d.ts","sourceRoot":"","sources":["../../src/lib/createExportsForComponentSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,6BA6C9D;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,YAM9C"}
package/dist/lib/createExportsForComponentSchemas.js CHANGED
@@ -30,11 +30,17 @@ export function createExportsForComponentSchemas(ast) {
30
30
  }
31
31
  export function getExportedNames(ast) {
32
32
  return ast.reduce((acc, node) => {
33
- if (ts.isInterfaceDeclaration(node) &&
34
- ts.isIdentifier(node.name) &&
35
- node.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword))
33
+ if (isExported(node))
36
34
  acc.push(node.name.text);
37
35
  return acc;
38
36
  }, []);
39
37
  }
38
+ function isExported(node) {
39
+ return ('name' in node &&
40
+ ts.isIdentifier(node.name) &&
41
+ 'modifiers' in node &&
42
+ Array.isArray(node.modifiers) &&
43
+ node.modifiers.every(ts.isModifier) &&
44
+ node.modifiers.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword));
45
+ }
40
46
  //# sourceMappingURL=createExportsForComponentSchemas.js.map
package/dist/lib/createExportsForComponentSchemas.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createExportsForComponentSchemas.js","sourceRoot":"","sources":["../../src/lib/createExportsForComponentSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,UAAU,gCAAgC,CAAC,GAAc;IAC7D,MAAM,mBAAmB,GAAG,GAAG;SAC5B,MAAM,CAAC,EAAE,CAAC,sBAAsB,CAAC;SACjC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IACnD,IAAI,CAAC,mBAAmB;QAAE,OAAO,EAAE,CAAC;IAEpC,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,OAAO;SACjD,MAAM,CAAC,EAAE,CAAC,mBAAmB,CAAC;SAC9B,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAC9E,IAAI,CAAC,gBAAgB;QAAE,OAAO,EAAE,CAAC;IAEjC,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,WAAW,GACf,gBAAgB,CAAC,IAAI;QACrB,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,CAAC;QAC3C,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAW,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC3D,IAAI,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;gBACrC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC;oBAAE,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACtE,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,CAAC;IAE5B,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAChD,OAAO,EAAE,CAAC,OAAO,CAAC,0BAA0B,CAC1C,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EACrD,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,EACjC,SAAS,EACT,EAAE,CAAC,OAAO,CAAC,2BAA2B,CACpC,EAAE,CAAC,OAAO,CAAC,2BAA2B,CACpC,EAAE,CAAC,OAAO,CAAC,uBAAuB,CAChC,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,EACzC,SAAS,CACV,EACD,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAC9B,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAC1C,CACF,EACD,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CACvE,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAc;IAC7C,OAAO,GAAG,CAAC,MAAM,CAAW,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACxC,IACE,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC;YAC/B,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;YAC1B,IAAI,CAAC,SAAS,EAAE,IAAI,CAClB,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAC5D;YAED,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE3B,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
1
+ {"version":3,"file":"createExportsForComponentSchemas.js","sourceRoot":"","sources":["../../src/lib/createExportsForComponentSchemas.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openapi-qraft/openapi-typescript-plugin",
3
- "version": "1.2.0-next.1",
3
+ "version": "1.2.0-next.10",
4
4
  "type": "module",
5
5
  "scripts": {
6
6
  "build": "tsc --project tsconfig.build.json",
@@ -26,18 +26,18 @@
26
26
  }
27
27
  },
28
28
  "dependencies": {
29
- "@openapi-qraft/plugin": "^2.0.0-next.1",
30
- "openapi-typescript": "^7.3.0",
31
- "typescript": "^5.5.4"
29
+ "@openapi-qraft/plugin": "^2.0.0-next.10",
30
+ "openapi-typescript": "^7.4.0",
31
+ "typescript": "^5.6.2"
32
32
  },
33
33
  "devDependencies": {
34
34
  "@openapi-qraft/eslint-config": "1.0.0",
35
35
  "@openapi-qraft/test-fixtures": "1.0.0",
36
- "@types/node": "^18.19.4",
37
- "eslint": "^9.0.0",
38
- "memfs": "^4.9.2",
36
+ "@types/node": "^20.16.5",
37
+ "eslint": "^9.10.0",
38
+ "memfs": "^4.11.1",
39
39
  "rimraf": "^5.0.10",
40
- "vitest": "^1.4.0"
40
+ "vitest": "^1.6.0"
41
41
  },
42
42
  "files": [
43
43
  "dist",
package/src/lib/createExportsForComponentSchemas.ts CHANGED
@@ -49,15 +49,26 @@ export function createExportsForComponentSchemas(ast: ts.Node[]) {
49
49
 
50
50
  export function getExportedNames(ast: ts.Node[]) {
51
51
  return ast.reduce<string[]>((acc, node) => {
52
- if (
53
- ts.isInterfaceDeclaration(node) &&
54
- ts.isIdentifier(node.name) &&
55
- node.modifiers?.some(
56
- (modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword
57
- )
58
- )
59
- acc.push(node.name.text);
52
+ if (isExported(node)) acc.push(node.name.text);
60
53
 
61
54
  return acc;
62
55
  }, []);
63
56
  }
57
+
58
+ interface ExportableStructure extends ts.Node {
59
+ name: ts.Identifier;
60
+ modifiers: ts.ModifiersArray;
61
+ }
62
+
63
+ function isExported(node: ts.Node): node is ExportableStructure {
64
+ return (
65
+ 'name' in node &&
66
+ ts.isIdentifier(node.name as any) &&
67
+ 'modifiers' in node &&
68
+ Array.isArray(node.modifiers) &&
69
+ node.modifiers.every(ts.isModifier) &&
70
+ node.modifiers.some(
71
+ (modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword
72
+ )
73
+ );
74
+ }