Some nice stuff

Author: Jon Latane

dist/web/libharmony-0.2.js

@@ -18,7 +18,8 @@ <h3>musical computation made easy</h3>
 <div class="container">
     <p>
         Harmony is a DSL for music. It's written in Kotlin and supports JVM and JS compilation targets.
-        Harmony is licensed under the LGPL, so use it in your proprietary project and acknowledge us!
+        Harmony is licensed under the LGPL, so use it in your proprietary project and acknowledge us! Also
+        feel free to <a href="https://github.com/jonlatane/libharmony">fork or contribute</a>.
     </p>
     <p>
         Here's an example of what the Harmony library is capable of:

dist/web/libharmony-0.2.meta.js

@@ -1,5 +1,6 @@
 buildscript {
     ext.kotlin_version = '1.0.7'
+    ext.kotlin_js_version = '1.0.7'
 
     repositories {
         mavenCentral()
@@ -11,8 +12,14 @@ buildscript {
 
 apply plugin: 'kotlin2js'
 
+repositories {
+    maven {
+        url 'https://dl.bintray.com/kotlin/kotlin-dev/'
+    }
+}
+
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_js_version"
 }
 
 compileKotlin2Js {
@@ -32,7 +39,7 @@ compileKotlin2Js {
                 into "${rootProject.projectDir}/dist/web"
                 include { fileTreeElement ->
                     def path = fileTreeElement.path
-                    path.endsWith(".js") && (path.startsWith("META-INF/resources/") || !path.startsWith("META-INF/"))
+                    path.endsWith('.js') && (path.startsWith('META-INF/resources/') || !path.startsWith('META-INF/'))
                 }
             }
         }

index.html

@@ -5,7 +5,7 @@ package com.jonlatane.libharmony
 
 fun String.toInt() = parseInt(this)
 
-@native fun Char.isDigit(): Boolean {
+fun Char.isDigit(): Boolean {
     try {
         parseInt(this.toString())
         return true

javascript/build.gradle

@@ -0,0 +1,14 @@
+package com.jonlatane.libharmony
+
+/**
+ * Things that are handy to have in JS for testing purposes.
+ * 
+ * Created by jonlatane on 4/3/17.
+ */
+@JsName("getChordsInCMajor")
+fun getChordsInCMajor(vararg notes: String): Map<Int, List<String>> {
+    val pitches = notes.toList().map {Pitch(it)}.toTypedArray()
+    val chord = Chord(*pitches)
+    val data = Keys.CMajor.getRootLikelihoodsAndNames(chord)
+    return data
+}

javascript/src/main/kotlin/com/jonlatane/libharmony/KotlinJSCompat.kt

@@ -25,4 +25,7 @@ jar {
 sourceSets {
     main.kotlin.srcDirs += 'src/main/kotlin'
     main.kotlin.srcDirs += '../shared/src/main/kotlin'
+    test.kotlin.srcDirs += 'src/main/kotlin'
+    test.kotlin.srcDirs += 'src/test/kotlin'
+    test.kotlin.srcDirs += '../shared/src/test/kotlin'
 }

javascript/src/main/kotlin/com/jonlatane/libharmony/KotlinJSUtils.kt

@@ -1,5 +1,8 @@
 package com.jonlatane.libharmony
 
+/**
+ * Kotlin's JVM standard library does not include a JSName annotation.
+ */
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION,
         AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION)
-annotation class native
+annotation class JsName(val name: String)

jvm/build.gradle

@@ -23,7 +23,7 @@ import com.jonlatane.libharmony.Modulus.Companion.TWELVETONE
  * *
  * @getCharacteristic and @guessCharacteristic, for guessing the characteristic of a chord
  */
-@native open class Chord(vararg elements: Pitch) : PitchSet(Modulus.TWELVETONE, *elements) {
+open class Chord(vararg elements: Pitch) : PitchSet(Modulus.TWELVETONE, *elements) {
     var root: Pitch = elements.elementAtOrElse(0, {Pitch(0)})
     override fun toString(): String {
         return super.toString() + " / $root"
@@ -123,7 +123,7 @@ import com.jonlatane.libharmony.Modulus.Companion.TWELVETONE
          * *
          * @return
          */
-        @native fun guessCharacteristic(c: Chord, root: Int): Pair<String, Int> {
+        fun guessCharacteristic(c: Chord, root: Int): Pair<String, Int> {
             var name = ""
             var certainty = 0
 

jvm/src/main/kotlin/com/jonlatane/libharmony/KotlinJVMCompat.kt

@@ -12,7 +12,7 @@ import com.jonlatane.libharmony.Modulus.Companion.TWELVETONE
 
  * @author Jon
  */
-@native class Key(root: Pitch) : Scale(root) {
+class Key(root: Pitch) : Scale(root) {
     constructor(scale: Scale) : this(scale.root) {
         addAll(scale)
     }
@@ -41,7 +41,7 @@ import com.jonlatane.libharmony.Modulus.Companion.TWELVETONE
      * *
      * @return
      */
-    @native fun getNoteName(tone: Int): String {
+    fun getNoteName(tone: Int): String {
         val i: Int = tone % modulus!!
         var result = ""
 
@@ -101,15 +101,15 @@ import com.jonlatane.libharmony.Modulus.Companion.TWELVETONE
         return result
     }
 
-    @native fun getRootLikelihoodsAndNames(c: Chord): Map<Int, List<String>> {
+    fun getRootLikelihoodsAndNames(c: Chord): Map<Int, List<String>> {
         val result = mutableMapOf<Int, MutableList<String>>()
         for (n in 0..11) {
             val data = Chord.guessCharacteristic(c, n)
             val name = data.first
-            var score = data.second
-            if (n == c.root.tone) {
-                score += 1000
-            }
+            val score = data.second
+            //if (n == c.root.tone) {
+            //    score += 1000
+            //}
             var bucket: MutableList<String>? = result[score]
             if (bucket == null) {
                 bucket = mutableListOf<String>()

shared/src/main/kotlin/com/jonlatane/libharmony/Chord.kt

@@ -14,13 +14,15 @@ import com.jonlatane.libharmony.Pitch.Companion.getTone
  *
  * Created by jonlatane on 12/17/16.
  */
+@JsName("Pitch")
 data class Pitch(
         val tone: Int,
         val enharmonic: String? = null
 ) {
     /**
      * Convenience constructor from enharmonic only based on [getTone]
      */
+    @JsName("PitchFromEnharmonic")
     constructor(enharmonic: String) : this(getTone(enharmonic), enharmonic)
 
     init {