ng-openapi 0.3.1 → 0.3.2-pr-119-fix-118-nullable-format-strings-12ffce1.0

package/cli.cjs

@@ -897,7 +897,7 @@ function isDataTypeInterface(type) {
 __name(isDataTypeInterface, "isDataTypeInterface");
 
 // ../shared/src/config/constants.ts
-var disableLinting = `/* @ts-nocheck */
+var disableLinting = `// @ts-nocheck
 /* eslint-disable */
 /* @noformat */
 /* @formatter:off */
@@ -1093,10 +1093,7 @@ var TypeResolver = class {
           const dateType = this.config.options.dateType === "Date" ? "Date" : "string";
           return this.nullableType(dateType, isNullable);
         }
-        if (format === "binary") return "Blob";
-        if (format === "uuid") return "string";
-        if (format === "email") return "string";
-        if (format === "uri") return "string";
+        if (format === "binary") return this.nullableType("Blob", isNullable);
         return this.nullableType("string", isNullable);
       case "number":
       case "integer":
@@ -1516,12 +1513,12 @@ var TypeGenerator = class {
     };
   }
   applyBatchUpdates() {
-    this.sourceFile.insertText(0, TYPE_GENERATOR_HEADER_COMMENT);
     this.addSdkImports(this.sourceFile);
     this.sourceFile.addStatements(this.statements);
   }
   async finalize() {
     this.sourceFile.formatText();
+    this.sourceFile.insertText(0, TYPE_GENERATOR_HEADER_COMMENT);
     await this.sourceFile.save();
   }
   generatePerType(definitions) {
@@ -2111,7 +2108,6 @@ var ProviderGenerator = class {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    sourceFile.insertText(0, PROVIDER_GENERATOR_HEADER_COMMENT);
     const basePathTokenName = getBasePathTokenName(this.clientName);
     const interceptorsTokenName = getInterceptorsTokenName(this.clientName);
     const baseInterceptorClassName = `${this.capitalizeFirst(this.clientName)}BaseInterceptor`;
@@ -2198,6 +2194,7 @@ var ProviderGenerator = class {
       properties: configProperties
     });
     this.addMainProviderFunction(sourceFile, basePathTokenName, interceptorsTokenName, baseInterceptorClassName);
+    sourceFile.insertText(0, PROVIDER_GENERATOR_HEADER_COMMENT);
     sourceFile.formatText();
     sourceFile.saveSync();
   }
@@ -2322,7 +2319,6 @@ var BaseInterceptorGenerator = class {
     const sourceFile = this.#project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    sourceFile.insertText(0, BASE_INTERCEPTOR_HEADER_COMMENT(this.#clientName));
     const interceptorsTokenName = getInterceptorsTokenName(this.#clientName);
     const clientContextTokenName = getClientContextTokenName(this.#clientName);
     sourceFile.addImportDeclarations([
@@ -2420,6 +2416,7 @@ var BaseInterceptorGenerator = class {
         }
       ]
     });
+    sourceFile.insertText(0, BASE_INTERCEPTOR_HEADER_COMMENT(this.#clientName));
     sourceFile.formatText();
     sourceFile.saveSync();
   }
@@ -3275,6 +3272,7 @@ var ServiceGenerator = class {
     });
     this.addServiceClass(sourceFile, controllerName, operations);
     sourceFile.fixMissingImports().formatText();
+    sourceFile.insertText(0, SERVICE_GENERATOR_HEADER_COMMENT(controllerName));
     sourceFile.saveSync();
   }
   addServiceClass(sourceFile, controllerName, operations) {
@@ -3282,7 +3280,6 @@ var ServiceGenerator = class {
     const basePathTokenName = getBasePathTokenName(this.config.clientName);
     const clientContextTokenName = getClientContextTokenName(this.config.clientName);
     const serviceDecorator = emitServiceDecorator(this.config.options);
-    sourceFile.insertText(0, SERVICE_GENERATOR_HEADER_COMMENT(controllerName));
     sourceFile.addImportDeclarations([
       {
         namedImports: [

package/index.js

@@ -1075,7 +1075,7 @@ function defineConfig(config) {
 __name(defineConfig, "defineConfig");
 
 // ../shared/src/config/constants.ts
-var disableLinting = `/* @ts-nocheck */
+var disableLinting = `// @ts-nocheck
 /* eslint-disable */
 /* @noformat */
 /* @formatter:off */
@@ -1268,10 +1268,7 @@ var _TypeResolver = class _TypeResolver {
           const dateType = this.config.options.dateType === "Date" ? "Date" : "string";
           return this.nullableType(dateType, isNullable);
         }
-        if (format === "binary") return "Blob";
-        if (format === "uuid") return "string";
-        if (format === "email") return "string";
-        if (format === "uri") return "string";
+        if (format === "binary") return this.nullableType("Blob", isNullable);
         return this.nullableType("string", isNullable);
       case "number":
       case "integer":
@@ -1697,13 +1694,13 @@ var _TypeGenerator = class _TypeGenerator {
     };
   }
   applyBatchUpdates() {
-    this.sourceFile.insertText(0, TYPE_GENERATOR_HEADER_COMMENT);
     this.addSdkImports(this.sourceFile);
     this.sourceFile.addStatements(this.statements);
   }
   finalize() {
     return __async(this, null, function* () {
       this.sourceFile.formatText();
+      this.sourceFile.insertText(0, TYPE_GENERATOR_HEADER_COMMENT);
       yield this.sourceFile.save();
     });
   }
@@ -2290,7 +2287,6 @@ var _ProviderGenerator = class _ProviderGenerator {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    sourceFile.insertText(0, PROVIDER_GENERATOR_HEADER_COMMENT);
     const basePathTokenName = getBasePathTokenName(this.clientName);
     const interceptorsTokenName = getInterceptorsTokenName(this.clientName);
     const baseInterceptorClassName = `${this.capitalizeFirst(this.clientName)}BaseInterceptor`;
@@ -2377,6 +2373,7 @@ var _ProviderGenerator = class _ProviderGenerator {
       properties: configProperties
     });
     this.addMainProviderFunction(sourceFile, basePathTokenName, interceptorsTokenName, baseInterceptorClassName);
+    sourceFile.insertText(0, PROVIDER_GENERATOR_HEADER_COMMENT);
     sourceFile.formatText();
     sourceFile.saveSync();
   }
@@ -2501,7 +2498,6 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
     const sourceFile = __privateGet(this, _project).createSourceFile(filePath, "", {
       overwrite: true
     });
-    sourceFile.insertText(0, BASE_INTERCEPTOR_HEADER_COMMENT(__privateGet(this, _clientName)));
     const interceptorsTokenName = getInterceptorsTokenName(__privateGet(this, _clientName));
     const clientContextTokenName = getClientContextTokenName(__privateGet(this, _clientName));
     sourceFile.addImportDeclarations([
@@ -2599,6 +2595,7 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
         }
       ]
     });
+    sourceFile.insertText(0, BASE_INTERCEPTOR_HEADER_COMMENT(__privateGet(this, _clientName)));
     sourceFile.formatText();
     sourceFile.saveSync();
   }
@@ -3458,6 +3455,7 @@ var _ServiceGenerator = class _ServiceGenerator {
       });
       this.addServiceClass(sourceFile, controllerName, operations);
       sourceFile.fixMissingImports().formatText();
+      sourceFile.insertText(0, SERVICE_GENERATOR_HEADER_COMMENT(controllerName));
       sourceFile.saveSync();
     });
   }
@@ -3467,7 +3465,6 @@ var _ServiceGenerator = class _ServiceGenerator {
     const basePathTokenName = getBasePathTokenName(this.config.clientName);
     const clientContextTokenName = getClientContextTokenName(this.config.clientName);
     const serviceDecorator = emitServiceDecorator(this.config.options);
-    sourceFile.insertText(0, SERVICE_GENERATOR_HEADER_COMMENT(controllerName));
     sourceFile.addImportDeclarations([
       {
         namedImports: [

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ng-openapi",
-    "version": "0.3.1",
+    "version": "0.3.2-pr-119-fix-118-nullable-format-strings-12ffce1.0",
     "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
     "keywords": [
         "ng-openapi",