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

package/CHANGELOG.md

@@ -1,5 +1,68 @@
 # @openapi-qraft/openapi-typescript
 
+## 1.2.0-next.11
+
+### Patch Changes
+
+- @openapi-qraft/plugin@2.0.0-next.11
+
+## 1.2.0-next.10
+
+### Patch Changes
+
+- Updated dependencies [8c77eb2]
+  - @openapi-qraft/plugin@2.0.0-next.10
+
+## 1.2.0-next.9
+
+### Patch Changes
+
+- 9dc1918: Simplified `TParams` type for conditional expressions.
+  - @openapi-qraft/plugin@2.0.0-next.9
+
+## 1.2.0-next.8
+
+### Patch Changes
+
+- @openapi-qraft/plugin@2.0.0-next.8
+
+## 1.2.0-next.7
+
+### Patch Changes
+
+- @openapi-qraft/plugin@2.0.0-next.7
+
+## 1.2.0-next.6
+
+### Patch Changes
+
+- @openapi-qraft/plugin@2.0.0-next.6
+
+## 1.2.0-next.5
+
+### Patch Changes
+
+- @openapi-qraft/plugin@2.0.0-next.5
+
+## 1.2.0-next.4
+
+### Patch Changes
+
+- cd8a856: Resolved conflict between explicit exports and generated enum exports by aligning export strategy.
+  - @openapi-qraft/plugin@2.0.0-next.4
+
+## 1.2.0-next.3
+
+### Patch Changes
+
+- @openapi-qraft/plugin@2.0.0-next.3
+
+## 1.2.0-next.2
+
+### Patch Changes
+
+- @openapi-qraft/plugin@2.0.0-next.2
+
 ## 1.2.0-next.1
 
 ### Minor Changes

package/dist/lib/createExportsForComponentSchemas.d.ts.map

@@ -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"}
+{"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

@@ -30,11 +30,17 @@ export function createExportsForComponentSchemas(ast) {
 }
 export function getExportedNames(ast) {
     return ast.reduce((acc, node) => {
-        if (ts.isInterfaceDeclaration(node) &&
-            ts.isIdentifier(node.name) &&
-            node.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword))
+        if (isExported(node))
             acc.push(node.name.text);
         return acc;
     }, []);
 }
+function isExported(node) {
+    return ('name' in node &&
+        ts.isIdentifier(node.name) &&
+        'modifiers' in node &&
+        Array.isArray(node.modifiers) &&
+        node.modifiers.every(ts.isModifier) &&
+        node.modifiers.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword));
+}
 //# sourceMappingURL=createExportsForComponentSchemas.js.map

package/dist/lib/createExportsForComponentSchemas.js.map

@@ -1 +1 @@
-{"version":3,"file":"createExportsForComponentSchemas.js","sourceRoot":"","sources":["../../src/lib/createExportsForComponentSchemas.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createExportsForComponentSchemas.js","sourceRoot":"","sources":["../../src/lib/createExportsForComponentSchemas.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/openapi-typescript-plugin",
-  "version": "1.2.0-next.1",
+  "version": "1.2.0-next.11",
   "type": "module",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
@@ -26,18 +26,18 @@
     }
   },
   "dependencies": {
-    "@openapi-qraft/plugin": "^2.0.0-next.1",
-    "openapi-typescript": "^7.3.0",
-    "typescript": "^5.5.4"
+    "@openapi-qraft/plugin": "^2.0.0-next.11",
+    "openapi-typescript": "^7.4.0",
+    "typescript": "^5.6.2"
   },
   "devDependencies": {
     "@openapi-qraft/eslint-config": "1.0.0",
     "@openapi-qraft/test-fixtures": "1.0.0",
-    "@types/node": "^18.19.4",
-    "eslint": "^9.0.0",
-    "memfs": "^4.9.2",
+    "@types/node": "^20.16.5",
+    "eslint": "^9.10.0",
+    "memfs": "^4.11.1",
     "rimraf": "^5.0.10",
-    "vitest": "^1.4.0"
+    "vitest": "^1.6.0"
   },
   "files": [
     "dist",

package/src/lib/createExportsForComponentSchemas.ts

@@ -49,15 +49,26 @@ export function createExportsForComponentSchemas(ast: ts.Node[]) {
 
 export function getExportedNames(ast: ts.Node[]) {
   return ast.reduce<string[]>((acc, node) => {
-    if (
-      ts.isInterfaceDeclaration(node) &&
-      ts.isIdentifier(node.name) &&
-      node.modifiers?.some(
-        (modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword
-      )
-    )
-      acc.push(node.name.text);
+    if (isExported(node)) acc.push(node.name.text);
 
     return acc;
   }, []);
 }
+
+interface ExportableStructure extends ts.Node {
+  name: ts.Identifier;
+  modifiers: ts.ModifiersArray;
+}
+
+function isExported(node: ts.Node): node is ExportableStructure {
+  return (
+    'name' in node &&
+    ts.isIdentifier(node.name as any) &&
+    'modifiers' in node &&
+    Array.isArray(node.modifiers) &&
+    node.modifiers.every(ts.isModifier) &&
+    node.modifiers.some(
+      (modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword
+    )
+  );
+}