Combine javascript and javascript-apollo generators (#13270)

* Combine javascript and javascript-apollo generator functionality

* Combine javascript and javascript-apollo templates

* update configs

* deprecate javascript-apollo generator

* bonus magic string deletion ✨

* update samples

* update generator docs

* fix: include .babelrc in apollo generation

* update samples

* update samples

* rename javascript-apollo to javascript-apollo-deprecated

* fix javascript apollo library template

Apollo library now uses the partial_model_generic template file from the ES6 library, as it includes many fixes and improvements (including handling models with ill-named attributes)

* update samples

* Create javascript-apollo-deprecated.md

* Updated javascript generator template's gitignore

Updates .gitignore with that from https://github.com/github/gitignore/blob/main/Node.gitignore

Main reason for the update is to ignore the 'dist' folder with compiled files by default.

* javascript generator: merge api_test template files

The only difference is that Apollo is not designed for browser, so having a "if(browser)" check is useless, but doesn't hurt.

* update docs

* cleanup

* avoid possible config clash

* update javascript-apollo sample

* update javascript-es6 sample

I kept the pom.xml from before

* update javascript-promise-es6 sample

kept pom.xml

* update samples

samples/client/petstore/javascript-apollo/test/api/AnotherFakeApi.spec.js

@@ -0,0 +1,63 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', process.cwd()+'/src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.AnotherFakeApi();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('AnotherFakeApi', function() {
+    describe('call123testSpecialTags', function() {
+      it('should call call123testSpecialTags successfully', function(done) {
+        //uncomment below and update the code to test call123testSpecialTags
+        //instance.call123testSpecialTags(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+  });
+
+}));

samples/client/petstore/javascript-apollo/test/api/DefaultApi.spec.js

@@ -0,0 +1,63 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', process.cwd()+'/src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.DefaultApi();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('DefaultApi', function() {
+    describe('fooGet', function() {
+      it('should call fooGet successfully', function(done) {
+        //uncomment below and update the code to test fooGet
+        //instance.fooGet(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+  });
+
+}));

samples/client/petstore/javascript-apollo/test/api/FakeApi.spec.js

@@ -0,0 +1,223 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', process.cwd()+'/src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.FakeApi();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('FakeApi', function() {
+    describe('fakeHealthGet', function() {
+      it('should call fakeHealthGet successfully', function(done) {
+        //uncomment below and update the code to test fakeHealthGet
+        //instance.fakeHealthGet(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('fakeHttpSignatureTest', function() {
+      it('should call fakeHttpSignatureTest successfully', function(done) {
+        //uncomment below and update the code to test fakeHttpSignatureTest
+        //instance.fakeHttpSignatureTest(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('fakeOuterBooleanSerialize', function() {
+      it('should call fakeOuterBooleanSerialize successfully', function(done) {
+        //uncomment below and update the code to test fakeOuterBooleanSerialize
+        //instance.fakeOuterBooleanSerialize(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('fakeOuterCompositeSerialize', function() {
+      it('should call fakeOuterCompositeSerialize successfully', function(done) {
+        //uncomment below and update the code to test fakeOuterCompositeSerialize
+        //instance.fakeOuterCompositeSerialize(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('fakeOuterNumberSerialize', function() {
+      it('should call fakeOuterNumberSerialize successfully', function(done) {
+        //uncomment below and update the code to test fakeOuterNumberSerialize
+        //instance.fakeOuterNumberSerialize(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('fakeOuterStringSerialize', function() {
+      it('should call fakeOuterStringSerialize successfully', function(done) {
+        //uncomment below and update the code to test fakeOuterStringSerialize
+        //instance.fakeOuterStringSerialize(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('fakePropertyEnumIntegerSerialize', function() {
+      it('should call fakePropertyEnumIntegerSerialize successfully', function(done) {
+        //uncomment below and update the code to test fakePropertyEnumIntegerSerialize
+        //instance.fakePropertyEnumIntegerSerialize(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testBodyWithBinary', function() {
+      it('should call testBodyWithBinary successfully', function(done) {
+        //uncomment below and update the code to test testBodyWithBinary
+        //instance.testBodyWithBinary(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testBodyWithFileSchema', function() {
+      it('should call testBodyWithFileSchema successfully', function(done) {
+        //uncomment below and update the code to test testBodyWithFileSchema
+        //instance.testBodyWithFileSchema(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testBodyWithQueryParams', function() {
+      it('should call testBodyWithQueryParams successfully', function(done) {
+        //uncomment below and update the code to test testBodyWithQueryParams
+        //instance.testBodyWithQueryParams(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testClientModel', function() {
+      it('should call testClientModel successfully', function(done) {
+        //uncomment below and update the code to test testClientModel
+        //instance.testClientModel(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testEndpointParameters', function() {
+      it('should call testEndpointParameters successfully', function(done) {
+        //uncomment below and update the code to test testEndpointParameters
+        //instance.testEndpointParameters(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testEnumParameters', function() {
+      it('should call testEnumParameters successfully', function(done) {
+        //uncomment below and update the code to test testEnumParameters
+        //instance.testEnumParameters(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testGroupParameters', function() {
+      it('should call testGroupParameters successfully', function(done) {
+        //uncomment below and update the code to test testGroupParameters
+        //instance.testGroupParameters(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testInlineAdditionalProperties', function() {
+      it('should call testInlineAdditionalProperties successfully', function(done) {
+        //uncomment below and update the code to test testInlineAdditionalProperties
+        //instance.testInlineAdditionalProperties(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testJsonFormData', function() {
+      it('should call testJsonFormData successfully', function(done) {
+        //uncomment below and update the code to test testJsonFormData
+        //instance.testJsonFormData(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testQueryParameterCollectionFormat', function() {
+      it('should call testQueryParameterCollectionFormat successfully', function(done) {
+        //uncomment below and update the code to test testQueryParameterCollectionFormat
+        //instance.testQueryParameterCollectionFormat(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+  });
+
+}));

samples/client/petstore/javascript-apollo/test/api/FakeClassnameTags123Api.spec.js

@@ -0,0 +1,63 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', process.cwd()+'/src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.FakeClassnameTags123Api();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('FakeClassnameTags123Api', function() {
+    describe('testClassname', function() {
+      it('should call testClassname successfully', function(done) {
+        //uncomment below and update the code to test testClassname
+        //instance.testClassname(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+  });
+
+}));

samples/client/petstore/javascript-apollo/test/api/PetApi.spec.js

@@ -1,6 +1,6 @@
 /**
  * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * The version of the OpenAPI document: 1.0.0
  * 
@@ -11,34 +11,43 @@
  *
  */
 
-// CommonJS-like environments that support module.exports, like Node.
-factory(require('expect.js'), require(process.cwd()+'/src/index'));
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', process.cwd()+'/src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
 
-'use strict';
+  var instance;
 
-var instance;
+  beforeEach(function() {
+    instance = new OpenApiPetstore.PetApi();
+  });
 
-beforeEach(function() {
-  instance = new OpenApiPetstore.PetApi();
-});
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
 
-var getProperty = function(object, getter, property) {
-  // Use getter method if present; otherwise, get the property directly.
-  if (typeof object[getter] === 'function')
-    return object[getter]();
-  else
-    return object[property];
-}
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
 
-var setProperty = function(object, setter, property, value) {
-  // Use setter method if present; otherwise, set the property directly.
-  if (typeof object[setter] === 'function')
-    object[setter](value);
-  else
-    object[property] = value;
-}
-
-describe('PetApi', function() {
+  describe('PetApi', function() {
     describe('addPet', function() {
       it('should call addPet successfully', function(done) {
         //uncomment below and update the code to test addPet
@@ -119,4 +128,16 @@ describe('PetApi', function() {
         done();
       });
     });
-});
+    describe('uploadFileWithRequiredFile', function() {
+      it('should call uploadFileWithRequiredFile successfully', function(done) {
+        //uncomment below and update the code to test uploadFileWithRequiredFile
+        //instance.uploadFileWithRequiredFile(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+  });
+
+}));

samples/client/petstore/javascript-apollo/test/api/StoreApi.spec.js

@@ -1,6 +1,6 @@
 /**
  * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * The version of the OpenAPI document: 1.0.0
  * 
@@ -11,34 +11,43 @@
  *
  */
 
-// CommonJS-like environments that support module.exports, like Node.
-factory(require('expect.js'), require(process.cwd()+'/src/index'));
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', process.cwd()+'/src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
 
-'use strict';
+  var instance;
 
-var instance;
+  beforeEach(function() {
+    instance = new OpenApiPetstore.StoreApi();
+  });
 
-beforeEach(function() {
-  instance = new OpenApiPetstore.StoreApi();
-});
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
 
-var getProperty = function(object, getter, property) {
-  // Use getter method if present; otherwise, get the property directly.
-  if (typeof object[getter] === 'function')
-    return object[getter]();
-  else
-    return object[property];
-}
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
 
-var setProperty = function(object, setter, property, value) {
-  // Use setter method if present; otherwise, set the property directly.
-  if (typeof object[setter] === 'function')
-    object[setter](value);
-  else
-    object[property] = value;
-}
-
-describe('StoreApi', function() {
+  describe('StoreApi', function() {
     describe('deleteOrder', function() {
       it('should call deleteOrder successfully', function(done) {
         //uncomment below and update the code to test deleteOrder
@@ -79,4 +88,6 @@ describe('StoreApi', function() {
         done();
       });
     });
-});
+  });
+
+}));

samples/client/petstore/javascript-apollo/test/api/UserApi.spec.js

@@ -1,6 +1,6 @@
 /**
  * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * The version of the OpenAPI document: 1.0.0
  * 
@@ -11,34 +11,43 @@
  *
  */
 
-// CommonJS-like environments that support module.exports, like Node.
-factory(require('expect.js'), require(process.cwd()+'/src/index'));
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', process.cwd()+'/src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
 
-'use strict';
+  var instance;
 
-var instance;
+  beforeEach(function() {
+    instance = new OpenApiPetstore.UserApi();
+  });
 
-beforeEach(function() {
-  instance = new OpenApiPetstore.UserApi();
-});
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
 
-var getProperty = function(object, getter, property) {
-  // Use getter method if present; otherwise, get the property directly.
-  if (typeof object[getter] === 'function')
-    return object[getter]();
-  else
-    return object[property];
-}
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
 
-var setProperty = function(object, setter, property, value) {
-  // Use setter method if present; otherwise, set the property directly.
-  if (typeof object[setter] === 'function')
-    object[setter](value);
-  else
-    object[property] = value;
-}
-
-describe('UserApi', function() {
+  describe('UserApi', function() {
     describe('createUser', function() {
       it('should call createUser successfully', function(done) {
         //uncomment below and update the code to test createUser
@@ -119,4 +128,6 @@ describe('UserApi', function() {
         done();
       });
     });
-});
+  });
+
+}));