fix: Failing generator-swiftserver integration tests for SDKGen servi…

…ce (#412)

.gitignore

@@ -4,3 +4,4 @@ coverage/
 coverage.lcov
 .vscode/
 *.swp
+.DS_Store

lib/sdkGenHelper.js

@@ -139,7 +139,6 @@ exports.getServerSDKAsync = function (sdkName, generatedID) {
     .pipe(unzip.Extract({ path: tempDir }))
     .on('close', () => {
       debug(`finished server SDK download and unzip for ${sdkName} from ${serverDownloadURL} to ${tempDir}`)
-
       var sdkDir = path.join(tempDir, sdkName)
       debug(`reading package dependencies from server SDK ${sdkName} in ${sdkDir}`)
       try {
@@ -158,27 +157,16 @@ function ensureTrailingComma (string) {
 
 function readPackageDependencies (sdkName, sdkDir) {
   var originFile = fs.readFileSync(sdkDir + '/Package.swift', 'utf8')
-  var originMatches = originFile.match(/\.\bPackage\b.*/g)
-  var parsedDependencies = null
+  var originMatches = originFile.match(/\.\bpackage\b.*/g)
   if (originMatches) {
-    parsedDependencies = []
-    // input  : .Package(url: "https://github.com/IBM-Swift/Kitura.git", majorVersion: 1, minor: 7)
-    // output : .package(url: "https://github.com/IBM-Swift/Kitura.git", .upToNextMinor(from : "1.7.0")
-    originMatches.forEach(function (dependency) {
-      if (dependency.indexOf('minor') < 0) {
-        throw Error(chalk.red('SDKGEN Package dependency format is incompatible'))
+    var re = /\.package\(url:\s"https:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&//=]*).git",\s((\.upToNextMajor|\.upToNextMinor)\(from:\s"(-?\d+\.){2}-?\d+"\)|from:\s"(-?\d+\.){2}-?\d+")\),?$/
+    debug(`found ${originMatches.length} package dependencies in server SDK ${sdkName}`)
+    return originMatches.map(function (m) {
+      if (!re.test(m)) {
+        throw Error(chalk.red('SDKGEN Package dependency format is incompatible with input: ' + m))
       }
-      dependency = dependency.replace('Package', 'package')
-      var commaSplit = dependency.split(',')
-      var majorVersion = commaSplit[1].replace(/[^0-9.]/g, '')
-      var minor = commaSplit[2].replace(/[^0-9.]/g, '')
-      dependency = commaSplit[0] + ', .upToNextMinor( from:"' + majorVersion + '.' + minor + '.0"))'
-      parsedDependencies.push(dependency)
+      return ensureTrailingComma(m.trim())
     })
-  }
-  if (parsedDependencies) {
-    debug(`found ${parsedDependencies.length} package dependencies in server SDK ${sdkName}`)
-    return parsedDependencies.map(m => ensureTrailingComma(m.trim()))
   } else {
     debug(`found no package dependencies in server SDK ${sdkName}`)
     return []

refresh/templates/common/Package.swift

@@ -24,7 +24,7 @@ let package = Package(
 <%    }); -%>
       ]),
 <%    Object.keys(sdkTargets).forEach(function(target) { -%>
-      .target(name: "<%- sdkTargets[target] %>", dependencies: ["ObjectMapper","SimpleHttpClient"], path: "Sources/<%- sdkTargets[target] %>" ),
+      .target(name: "<%- sdkTargets[target] %>", dependencies: ["SimpleHttpClient"], path: "Sources/<%- sdkTargets[target] %>" ),
 <%    }); -%>
 <%  }else { _%>
       ]),

test/unit/refresh.js

@@ -1005,7 +1005,7 @@ describe('Unit tests for swiftserver:refresh', function () {
 
         it(`should throw error`, function () {
           assert(error, 'Should throw an error')
-          assert(error.match(/SDKGEN.*incompatible/), 'Thrown error should be about failing to parse SDK package dependency, it was: ' + error)
+          assert(error.match(/SDKGEN.*incompatible.*.package\(url: ".*", from: "1\.0"\)/), 'Thrown error should be about failing to parse SDK package dependency, it was: ' + error)
         })
       })
     })