OwnLang Next

.gitignore

@@ -1,12 +1,9 @@
 /.gradle/
 /.idea/
 /.nb-gradle/
-/build/
+**/build/
 /dist/
 /out/
 /store/
 /optimizations/
-/nbproject/private/
-/src/main/generatedJava/
-OwnLang.iml
-.nb-gradle-properties
+OwnLang.iml

README.md

@@ -8,7 +8,7 @@ OwnLang - dynamic functional programming language inspired by Scala and Python.
 
 | Free | Pro | Desktop |
 | :--: | :-: | :-----: |
-| [![Free](https://developer.android.com/images/brand/en_generic_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=com.annimon.ownlang.free) | [![Pro](https://developer.android.com/images/brand/en_generic_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=com.annimon.ownlang) | [v1.5.0](https://github.com/aNNiMON/Own-Programming-Language-Tutorial/releases/tag/v1.5.0)
+| [![Free](https://developer.android.com/images/brand/en_generic_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=com.annimon.ownlang.free) | [![Pro](https://developer.android.com/images/brand/en_generic_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=com.annimon.ownlang) | [v1.5.0](https://github.com/aNNiMON/Own-Programming-Language-Tutorial/releases/tag/v1.5.0) |
 
 Also available as AUR package:
 
@@ -71,7 +71,7 @@ fizzbuzz()
 Operate data in functional style.
 
 ```scala
-use ["std", "functional"]
+use std, functional
 
 nums = [1,2,3,4,5,6,7,8,9,10]
 nums = filter(nums, def(x) = x % 2 == 0)
@@ -93,7 +93,7 @@ println "Sum: " + stream(range(1, 11))
 Why not?
 
 ```scala
-use ["std", "types", "math"]
+use std, types, math
 
 def `..`(a, b) = range(a, b)
 def `**`(a, b) = int(pow(a, b))
@@ -107,13 +107,11 @@ for y : 1 .. 10 {
 Easy async HTTP requests with `http` module.
 
 ```scala
-use "std"
-use "http"
-use "functional"
+use std, http, functional
 
 // GET request
 http("https://api.github.com/events", def(r) {
-  use "json"
+  use json
   events = jsondecode(r)
   println events[0]
 })
@@ -141,7 +139,7 @@ def patch_callback(v) {
 
 ## Build
 
-Build using Gradle `./gradlew dist`
+Build using Gradle `./gradlew shadowJar`
 
 or take a look to [latest release](https://github.com/aNNiMON/Own-Programming-Language-Tutorial/releases/latest) for binaries.
 

build.gradle

@@ -1,70 +1,34 @@
-plugins {
-    id 'java'
+ext {
+    versions = [
+            project: '2.0.0',
+
+            json: '20230227', // org.json:json
+            snakeyaml: '1.20', // org.yaml:snakeyaml
+            okhttp: '3.8.1', // com.squareup.okhttp3:okhttp
+            socket: '1.0.2', // io.socket:socket.io-client
+            jline: '2.14.5', // jline:jline
+
+            javalin: '5.6.3', // io.javalin:javalin
+            slf4j: '2.0.9', // org.slf4j:slf4j-simple
+            jackson: '2.15.3', // com.fasterxml.jackson.core:jackson-databind
+
+            junit: '5.9.2', // org.junit:junit-bom
+            jmh: '1.37', // org.openjdk.jmh:jmh-core
+            assertj: '3.24.2' // org.assertj:assertj-core
+    ]
 }
 
-group = 'com.annimon'
-version = '2.0-SNAPSHOT'
-
-[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
-if (!hasProperty('mainClass')) {
-    ext.mainClass = 'com.annimon.ownlang.Main'
-}
-
-ext.generatedJavaDir = "${rootProject.projectDir}/src/main/generatedJava"
-sourceSets.main.java.srcDirs += project.generatedJavaDir
-
-repositories {
-    mavenCentral()
-}
-
-tasks.register('generateJavaSources') {
-    doLast {
-        def source = """
-            package com.annimon.ownlang;
-            class Gen {
-                private Gen() {}
-                public static final String BUILD_DATE = "${new Date().format('YYMMdd')}";
-            }
-            """.stripIndent()
-        def genFile = new File("${project.generatedJavaDir}/com/annimon/ownlang/Gen.java")
-        genFile.getParentFile().mkdirs()
-        genFile.write(source)
+allprojects {
+    repositories {
+        mavenCentral()
     }
-}
-compileJava.dependsOn(generateJavaSources)
 
-tasks.register('run', JavaExec) {
-    dependsOn classes
-    mainClass = project.mainClass
-    classpath = sourceSets.main.runtimeClasspath
-    standardInput = System.in
-    ignoreExitValue true
-}
-
-tasks.register('runOptimizing', JavaExec) {
-    dependsOn classes
-    mainClass = project.mainClass
-    classpath = sourceSets.main.runtimeClasspath
-    ignoreExitValue true
-    args '-o 9 -m -a -f program.own'.split(' ')
-}
-
-
-dependencies {
-    implementation ('io.socket:socket.io-client:1.0.2') {
-        exclude group: 'org.json', module: 'json'
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile).tap {
+            configureEach {
+                [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+                options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+            }
+        }
     }
-    implementation 'org.json:json:20230227'
-    implementation 'org.yaml:snakeyaml:1.20'
-    implementation 'jline:jline:2.14.5'
-
-    testImplementation platform('org.junit:junit-bom:5.9.2')
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.openjdk.jmh:jmh-core:1.37'
-    testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
 }
-
-test {
-    useJUnitPlatform()
-}

docs/.gitignore

@@ -0,0 +1,6 @@
+node_modules
+.temp
+.cache
+docs/.vuepress/configs/modules.js
+docs/.vuepress/dist/
+docs/*/modules/

docs/build.gradle

@@ -0,0 +1,54 @@
+plugins {
+    id 'java'
+}
+
+group = 'com.annimon'
+version = versions.project
+
+dependencies {
+    implementation project(":ownlang-core")
+    implementation project(":ownlang-parser")
+    implementation project(":ownlang-utils")
+    implementation project(":modules:main")
+    implementation project(":modules:canvasfx")
+    implementation project(":modules:server")
+
+    implementation "org.yaml:snakeyaml:${versions.snakeyaml}"
+}
+
+tasks.register('generateMarkdownModules') {
+    group = "documentation"
+    def ownlangExec = tasks.getByPath(':ownlang-desktop:ownlangExec')
+    doFirst {
+        ownlangExec.configure {
+            workingDir '../docs/src'
+            args '-f', 'docgen-md.own'
+        }
+    }
+    finalizedBy ownlangExec
+}
+
+tasks.register('runDocsDev', Exec) {
+    group = "documentation"
+    description = "Start docs dev server"
+    dependsOn generateMarkdownModules
+    workingDir '../docs/docs'
+    commandLine 'pnpm', 'docs:dev'
+}
+
+tasks.register('buildDocs', Exec) {
+    group = "documentation"
+    description = "Build docs to static site"
+    dependsOn generateMarkdownModules
+    workingDir '../docs/docs'
+    commandLine 'pnpm', 'docs:build'
+}
+
+tasks.register('generateModuleInfo', JavaExec) {
+    group = "documentation"
+    description = "Run sample program"
+    dependsOn classes
+    mainClass = 'com.annimon.ownlang.docs.ModulesInfoCreator'
+    classpath = sourceSets.main.runtimeClasspath
+    args 'server', 'okhttp'
+}

docs/docs/.vuepress/components/Scope.vue

@@ -0,0 +1,30 @@
+<template>
+  <span
+    class="badge scope"
+    :class="scope"
+  >
+    <slot>{{ scope }}</slot>
+  </span>
+</template>
+
+<script setup>
+defineProps({
+  scope: {
+    type: String,
+    required: true
+  }
+})
+</script>
+
+<style scoped>
+.badge.scope {
+  vertical-align: middle;
+  text-transform: capitalize;
+}
+.badge.android {
+  background-color: var(--c-badge-tip);
+}
+.badge.desktop {
+  background-color: var(--usc-scope);
+}
+</style>

docs/docs/.vuepress/components/Since.vue

@@ -0,0 +1,32 @@
+<template>
+  <span class="since">{{ text }} <b>{{ version }}</b></span>
+</template>
+
+<script>
+export default {
+  props: {
+    text: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    version: {
+      type: String,
+      required: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.since {
+  display: inline-block;
+  font-size: 13px;
+  height: 18px;
+  line-height: 18px;
+  border-radius: 3px;
+  padding: 0 4px;
+  color: var(--c-bg);
+  background-color: var(--usc-since);
+}
+</style>

docs/docs/.vuepress/config.js

@@ -0,0 +1,63 @@
+import { defineUserConfig, defaultTheme } from 'vuepress'
+import { getDirname, path } from '@vuepress/utils'
+import { registerComponentsPlugin } from '@vuepress/plugin-register-components'
+import { prismjsPlugin } from '@vuepress/plugin-prismjs'
+import { searchPlugin } from '@vuepress/plugin-search'
+import { sidebarConfig } from './configs/sidebar'
+import { navbarConfig } from './configs/navbar'
+import Prism from 'prismjs';
+import definePrismOwnLang from '../../../editors/prismjs/own-language.js'
+
+definePrismOwnLang(Prism)
+const __dirname = getDirname(import.meta.url)
+
+export default defineUserConfig({
+  base: "/docs/ownlang/",
+  locales: {
+    '/en/': {
+      lang: 'en-US',
+      title: 'OwnLang',
+      description: 'OwnLang documentation',
+    },
+    '/ru/': {
+      lang: 'ru-RU',
+      title: 'OwnLang',
+      description: 'Документация OwnLang',
+    }
+  },
+
+  theme: defaultTheme({
+    repo: 'aNNiMON/Own-Programming-Language-Tutorial',
+    docsBranch: 'next',
+    editLinkPattern: ':repo/blob/:branch/docs/docs/:path',
+    editLinkText: 'View source',
+    contributors: false,
+    locales: {
+      '/en/': {
+        selectLanguageName: 'English',
+        sidebar: sidebarConfig.en,
+        navbar: navbarConfig.en
+      },
+      '/ru/': {
+        selectLanguageName: 'Русский',
+        sidebar: sidebarConfig.ru,
+        navbar: navbarConfig.ru
+      }
+    }
+  }),
+
+  plugins: [
+    prismjsPlugin({
+      preloadLanguages: ['own', 'json']
+    }),
+    registerComponentsPlugin({
+      componentsDir: path.resolve(__dirname, './components'),
+    }),
+    searchPlugin({
+      locales: {
+        '/en/': { placeholder: 'Search' },
+        '/ru/': { placeholder: 'Поиск' },
+      },
+    }),
+  ],
+})

docs/docs/.vuepress/configs/navbar.js

@@ -0,0 +1,16 @@
+import pages from './pages'
+
+let navbar = {}
+for (let lang of ['en', 'ru']) {
+  let config = []
+  for (let [relativePath, entry] of Object.entries(pages)) {
+    const path = '/' + lang + relativePath
+    config.push({
+      text: entry.text[lang],
+      children: entry.pages.map(r => path + r)
+    })
+  }
+  navbar[lang] = config
+}
+
+export const navbarConfig = navbar