@openapi-qraft/openapi-typescript-plugin 1.0.5 → 1.0.6-beta.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @openapi-qraft/openapi-typescript
 
+## 1.0.6-beta.0
+
+### Patch Changes
+
+- @openapi-qraft/plugin@1.12.1-beta.0
+
 ## 1.0.5
 
 ### Patch Changes

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

@@ -1 +1 @@
-{"version":3,"file":"createOpenapiTypesImportPath.d.ts","sourceRoot":"","sources":["../../src/lib/createOpenapiTypesImportPath.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,oBAAoB,EAAE,MAAM,EAC5B,wBAAwB,EAAE,OAAO,UAKlC;AAUD;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,WAEzD"}
+{"version":3,"file":"createOpenapiTypesImportPath.d.ts","sourceRoot":"","sources":["../../src/lib/createOpenapiTypesImportPath.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,oBAAoB,EAAE,MAAM,EAC5B,wBAAwB,EAAE,OAAO,UAQlC;AAUD;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,WAEzD"}

package/dist/lib/createOpenapiTypesImportPath.js

@@ -4,6 +4,8 @@
  * @param explicitImportExtensions Whether to include explicit `.js` extensions in the import path.
  */
 export function createOpenapiTypesImportPath(openapiTypesFileName, explicitImportExtensions) {
+    if (openapiTypesFileName.endsWith('.d.ts'))
+        return `../${getTypeScriptFileBaseName(openapiTypesFileName)}.d.ts`;
     return explicitImportExtensions
         ? `../${getTypeScriptFileBaseName(openapiTypesFileName)}.js`
         : `../${openapiTypesFileName}`;

package/dist/lib/createOpenapiTypesImportPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"createOpenapiTypesImportPath.js","sourceRoot":"","sources":["../../src/lib/createOpenapiTypesImportPath.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,4BAA4B,CAC1C,oBAA4B,EAC5B,wBAAiC;IAEjC,OAAO,wBAAwB;QAC7B,CAAC,CAAC,MAAM,yBAAyB,CAAC,oBAAoB,CAAC,KAAK;QAC5D,CAAC,CAAC,MAAM,oBAAoB,EAAE,CAAC;AACnC,CAAC;AAED;;;GAGG;AACH,SAAS,yBAAyB,CAAC,oBAA4B;IAC7D,OAAO,oBAAoB,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,EAAE,CAAC,CAAC;AAClE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,QAAgB;IACxD,OAAO,oBAAoB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,oBAAoB;IAC3B,OAAO,aAAa,CAAC;AACvB,CAAC"}
+{"version":3,"file":"createOpenapiTypesImportPath.js","sourceRoot":"","sources":["../../src/lib/createOpenapiTypesImportPath.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,4BAA4B,CAC1C,oBAA4B,EAC5B,wBAAiC;IAEjC,IAAI,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC;QACxC,OAAO,MAAM,yBAAyB,CAAC,oBAAoB,CAAC,OAAO,CAAC;IAEtE,OAAO,wBAAwB;QAC7B,CAAC,CAAC,MAAM,yBAAyB,CAAC,oBAAoB,CAAC,KAAK;QAC5D,CAAC,CAAC,MAAM,oBAAoB,EAAE,CAAC;AACnC,CAAC;AAED;;;GAGG;AACH,SAAS,yBAAyB,CAAC,oBAA4B;IAC7D,OAAO,oBAAoB,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,EAAE,CAAC,CAAC;AAClE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,QAAgB;IACxD,OAAO,oBAAoB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,oBAAoB;IAC3B,OAAO,aAAa,CAAC;AACvB,CAAC"}

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAUlF,eAAO,MAAM,MAAM,EAAE,kBAiHpB,CAAC;AAEF,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,MAAM,UA0B7D"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAUlF,eAAO,MAAM,MAAM,EAAE,kBAqIpB,CAAC;AAEF,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,MAAM,UA0B7D"}

package/dist/plugin.js

@@ -58,6 +58,16 @@ export const plugin = {
                 // Set value to `--openapi-types-import-path` option
                 thisCommand.setOptionValue('openapiTypesImportPath', createOpenapiTypesImportPath(openapiTypesFileName, thisCommand.getOptionValue('explicitImportExtensions')));
             }
+            const openapiTypesImportPath = thisCommand.getOptionValue('openapiTypesImportPath');
+            // Validate if `--openapi-types-file-name` has a wrong file extension
+            if (thisCommand.getOptionValue('explicitImportExtensions') &&
+                thisCommand
+                    .getOptionValue('openapiTypesFileName')
+                    ?.endsWith?.('.d.ts') &&
+                openapiTypesImportPath &&
+                !openapiTypesImportPath?.endsWith?.('.d.ts')) {
+                throw new CommanderError(1, 'ERR_INVALID_OPENAPI_TYPES_FILE_NAME', "When '--explicit-import-extensions' is set, the '--openapi-types-file-name' must end with '.ts', or set '--openapi-types-import-path' to '.d.ts'");
+            }
             // If the option is not set, set it to true
             if (command.getOptionValue('exportOpenapiTypes') === undefined) {
                 thisCommand.setOptionValue('exportOpenapiTypes', true);

package/dist/plugin.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/openapi-typescript-plugin",
-  "version": "1.0.5",
+  "version": "1.0.6-beta.0",
   "type": "module",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "@openapi-qraft/plugin": "^1.12.0",
+    "@openapi-qraft/plugin": "^1.12.1-beta.0",
     "openapi-typescript": "7.0.0-next.11",
     "typescript": "^5.3.3"
   },

package/src/lib/createOpenapiTypesImportPath.ts

@@ -7,6 +7,9 @@ export function createOpenapiTypesImportPath(
   openapiTypesFileName: string,
   explicitImportExtensions: boolean
 ) {
+  if (openapiTypesFileName.endsWith('.d.ts'))
+    return `../${getTypeScriptFileBaseName(openapiTypesFileName)}.d.ts`;
+
   return explicitImportExtensions
     ? `../${getTypeScriptFileBaseName(openapiTypesFileName)}.js`
     : `../${openapiTypesFileName}`;

package/src/plugin.ts

@@ -117,6 +117,26 @@ export const plugin: QraftCommandPlugin = {
         );
       }
 
+      const openapiTypesImportPath = thisCommand.getOptionValue(
+        'openapiTypesImportPath'
+      );
+
+      // Validate if `--openapi-types-file-name` has a wrong file extension
+      if (
+        thisCommand.getOptionValue('explicitImportExtensions') &&
+        thisCommand
+          .getOptionValue('openapiTypesFileName')
+          ?.endsWith?.('.d.ts') &&
+        openapiTypesImportPath &&
+        !openapiTypesImportPath?.endsWith?.('.d.ts')
+      ) {
+        throw new CommanderError(
+          1,
+          'ERR_INVALID_OPENAPI_TYPES_FILE_NAME',
+          "When '--explicit-import-extensions' is set, the '--openapi-types-file-name' must end with '.ts', or set '--openapi-types-import-path' to '.d.ts'"
+        );
+      }
+
       // If the option is not set, set it to true
       if (command.getOptionValue('exportOpenapiTypes') === undefined) {
         thisCommand.setOptionValue('exportOpenapiTypes', true);