Tc type check

.github/workflows/clojure.yml

@@ -13,8 +13,10 @@ jobs:
       matrix:
         # Supported Java versions: LTS releases and latest
         # TODO: Add 18 when available
-        jdk: [8, 11, 17]
-        clojure: [10, 11]
+        #jdk: [8, 11, 17]
+        jdk: [17]
+        #clojure: [10, 11]
+        clojure: [11]
 
     name: Clojure ${{ matrix.clojure }} (Java ${{ matrix.jdk }})
 
@@ -35,6 +37,32 @@ jobs:
       - name: Run tests
         run: CLOJURE_ALIAS=clojure-${{ matrix.clojure }} bin/kaocha
 
+  build-typed:
+    strategy:
+      matrix:
+        this_split: [0, 1]
+
+    name: Typed Clojure
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Java 17
+        uses: actions/setup-java@v2.5.0
+        with:
+          distribution: zulu
+          java-version: 17
+          cache: maven
+      - name: Setup Clojure
+        uses: DeLaGuardo/setup-clojure@master
+        with:
+          cli: latest
+      - name: Type check
+        run: bin/typed :split "[$THIS_SPLIT 2]"
+        env:
+          THIS_SPLIT: ${{ matrix.this_split }}
+
   build-cljs:
     name: ClojureScript
 

bin/typed

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+clojure -X:test:typed "$@"

deps.edn

@@ -1,7 +1,7 @@
 {:paths ["src" "resources"]
  :aliases {:test {:extra-paths ["test"]
                   :extra-deps {com.gfredericks/test.chuck {:mvn/version "0.2.13"}
-                               lambdaisland/kaocha {:mvn/version "1.63.998"}
+                               lambdaisland/kaocha {:mvn/version "1.66.1034"}
                                lambdaisland/kaocha-cljs {:mvn/version "1.0.107"}
                                org.babashka/sci {:mvn/version "0.3.1"}
                                lambdaisland/kaocha-junit-xml {:mvn/version "0.0.76"}
@@ -17,7 +17,13 @@
                                lambdaisland/deep-diff {:mvn/version "0.0-47"}
                                com.bhauman/spell-spec {:mvn/version "0.1.2"}
                                org.clojure/spec-alpha2 {:git/url "https://github.com/clojure/spec-alpha2.git"
-                                                        :sha "99456b1856a6fd934e2c30b17920bd790dd81775"}}}
+                                                        :sha "99456b1856a6fd934e2c30b17920bd790dd81775"}
+                               org.typedclojure/typed.clojure {:git/url "https://github.com/typedclojure/typedclojure.git"
+                                                               :git/sha "7d8ca07c2e97e1152b0230a20cb7dccd8ca9f8c6"}}}
+           :typed {:exec-fn typed.clojure.main/exec
+                   :exec-args {:dirs ["src"]
+                               :watch-dirs ["src" "test" "resources"]
+                               :refresh-dirs ["src" "test"]}}
            :cljs-test-runner {:extra-deps {olical/cljs-test-runner {:mvn/version "3.8.0"}}
                               :extra-paths ["test" "cljs-test-runner-out/gen"]
                               :main-opts ["-m" "cljs-test-runner.main" "-d" "test"]}
@@ -58,7 +64,7 @@
                              "-Dclojure.compiler.direct-linking=true"]}
            :clojure-10 {:extra-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
            :clojure-11 {}}
- :deps {org.clojure/clojure {:mvn/version "1.11.0-rc1"}
+ :deps {org.clojure/clojure {:mvn/version "1.11.1"}
         borkdude/dynaload {:mvn/version "0.2.2"}
         borkdude/edamame {:mvn/version "0.0.19"}
         org.clojure/test.check {:mvn/version "1.1.1"}

resources/typedclojure_config.cljc

@@ -0,0 +1 @@
+{:ann [malli.impl.typedclojure-ann]}

src/malli/clj_kondo.cljc

@@ -1,4 +1,4 @@
-(ns malli.clj-kondo
+(ns ^:typed.clojure/ignore malli.clj-kondo
   #?(:cljs (:require-macros [malli.clj-kondo]))
   (:require [fipp.edn :as fipp]
             [malli.core :as m]

src/malli/core.cljc

@@ -1,12 +1,13 @@
-(ns malli.core
+(ns ^:typed.clojure/ignore malli.core
   (:refer-clojure :exclude [eval type -deref deref -lookup -key])
   #?(:cljs (:require-macros malli.core))
   (:require #?(:clj [clojure.walk :as walk])
             [clojure.core :as c]
             [malli.impl.regex :as re]
             [malli.impl.util :as miu]
             [malli.registry :as mr]
-            [malli.sci :as ms])
+            [malli.sci :as ms]
+            [typed.clojure :as-alias t])
   #?(:clj (:import (clojure.lang Associative IPersistentCollection MapEntry IPersistentVector LazilyPersistentVector PersistentArrayMap)
                    (java.util.concurrent.atomic AtomicReference)
                    (java.util.regex Pattern))))
@@ -83,7 +84,7 @@
   (-regex-unparser [this] "returns the raw internal regex unparser implementation")
   (-regex-parser [this] "returns the raw internal regex parser implementation")
   (-regex-transformer [this transformer method options] "returns the raw internal regex transformer implementation")
-  (-regex-min-max [this] "returns size of the sequence as [min max] vector. nil max means unbuond."))
+  (-regex-min-max [this] "returns size of the sequence as {:min .. :max ..} map. nil max means unbound."))
 
 (defn -ref-schema? [x] (#?(:clj instance?, :cljs implements?) malli.core.RefSchema x))
 (defn -entry-parser? [x] (#?(:clj instance?, :cljs implements?) malli.core.EntryParser x))
@@ -92,6 +93,7 @@
 (defn -ast? [x] (#?(:clj instance?, :cljs implements?) malli.core.AST x))
 (defn -transformer? [x] (#?(:clj instance?, :cljs implements?) malli.core.Transformer x))
 
+;; TODO support extend-type in cljs checker
 (extend-type #?(:clj Object, :cljs default)
   RegexSchema
   (-regex-op? [_] false)
@@ -123,8 +125,8 @@
 
   (-regex-min-max [_] {:min 1, :max 1}))
 
-#?(:clj (defmethod print-method ::into-schema [v ^java.io.Writer w] (.write w (str "#IntoSchema{:type " (pr-str (-type ^IntoSchema v)) "}"))))
-#?(:clj (defmethod print-method ::schema [v ^java.io.Writer w] (.write w (pr-str (-form ^Schema v)))))
+#?(:clj ^::t/ignore (defmethod print-method ::into-schema [v ^java.io.Writer w] (.write w (str "#IntoSchema{:type " (pr-str (-type v)) "}"))))
+#?(:clj ^::t/ignore (defmethod print-method ::schema [v ^java.io.Writer w] (.write w (pr-str (-form v)))))
 
 ;;
 ;; impl
@@ -148,7 +150,11 @@
 (defn -guard [pred tf] (when tf (fn [x] (if (pred x) (tf x) x))))
 
 (defn -unlift-keys [m prefix]
-  (reduce-kv #(if (= (name prefix) (namespace %2)) (assoc %1 (keyword (name %2)) %3) %1) {} m))
+  (reduce-kv (fn [^{::t/- (t/Map t/Ident x)} %1
+                  ^{::t/- t/Ident} %2
+                  ^{::t/- x} %3]
+               (if (= (name prefix) (namespace %2)) (assoc %1 (keyword (name %2)) %3) %1))
+             {} m))
 
 (defn ^:no-doc -check-children? [] true)
 
@@ -193,7 +199,7 @@
 
 (defn -equals [x y] (or (identical? x y) (= x y)))
 
-(defn -vmap ([os] (miu/-vmap identity os)) ([f os] (miu/-vmap f os)))
+(defn -vmap ([os] (miu/-vmap ^{::t/inst [x]} identity os)) ([f os] (miu/-vmap f os)))
 
 (defn -memoize [f]
   (let [value #?(:clj (AtomicReference. nil), :cljs (atom nil))]
@@ -247,7 +253,7 @@
 
 (defn -registry {:arglists '([] [{:keys [registry]}])}
   ([] default-registry)
-  ([opts] (or (when opts (mr/registry (opts :registry))) default-registry)))
+  ([opts] (or (when opts (mr/registry (:registry opts))) default-registry)))
 
 (defn -property-registry [m options f]
   (let [options (assoc options ::allow-invalid-refs true)]

src/malli/destructure.cljc

@@ -1,4 +1,4 @@
-(ns malli.destructure
+(ns ^:typed.clojure/ignore malli.destructure
   (:require [clojure.walk :as walk]
             [malli.core :as m]
             [malli.impl.util :as miu]))

src/malli/dev.clj

@@ -1,4 +1,4 @@
-(ns malli.dev
+(ns ^:typed.clojure/ignore malli.dev
   (:require [malli.clj-kondo :as clj-kondo]
             [malli.core :as m]
             [malli.dev.pretty :as pretty]

src/malli/dev/cljs.cljc

@@ -1,4 +1,4 @@
-(ns malli.dev.cljs
+(ns ^:typed.clojure/ignore malli.dev.cljs
   #?(:cljs (:require-macros [malli.dev.cljs]))
   #?(:cljs (:require [malli.instrument.cljs]
                      [malli.dev.pretty :as pretty]))

src/malli/dev/pretty.cljc

@@ -1,4 +1,4 @@
-(ns malli.dev.pretty
+(ns ^:typed.clojure/ignore malli.dev.pretty
   (:require [malli.core :as m]
             [malli.dev.virhe :as v]
             [malli.error :as me]))

src/malli/dev/virhe.cljc

@@ -1,4 +1,4 @@
-(ns malli.dev.virhe
+(ns ^:typed.clojure/ignore malli.dev.virhe
   "initial code for https://github.com/metosin/virhe"
   (:require [arrangement.core]
             [fipp.edn]

src/malli/dot.cljc

@@ -1,4 +1,4 @@
-(ns malli.dot
+(ns ^:typed.clojure/ignore malli.dot
   (:require [clojure.string :as str]
             [malli.core :as m]
             [malli.registry :as mr]

src/malli/edn.cljc

@@ -1,4 +1,4 @@
-(ns malli.edn
+(ns ^:typed.clojure/ignore malli.edn
   (:refer-clojure :exclude [read-string])
   (:require [edamame.core :as edamame]
             [malli.core :as m]))

src/malli/error.cljc

@@ -1,4 +1,4 @@
-(ns malli.error
+(ns ^:typed.clojure/ignore malli.error
   (:require [clojure.string :as str]
             [malli.core :as m]
             [malli.util :as mu]))

src/malli/experimental.cljc

@@ -1,4 +1,4 @@
-(ns malli.experimental
+(ns ^:typed.clojure/ignore malli.experimental
   (:refer-clojure :exclude [defn])
   #?(:cljs (:require-macros malli.experimental))
   (:require [clojure.core :as c]

src/malli/experimental/lite.cljc

@@ -1,4 +1,4 @@
-(ns malli.experimental.lite
+(ns ^:typed.clojure/ignore malli.experimental.lite
   (:refer-clojure :exclude [set vector and or])
   (:require [malli.core :as m]))
 

src/malli/generator.cljc

@@ -1,4 +1,4 @@
-(ns malli.generator
+(ns ^:typed.clojure/ignore malli.generator
   (:require [clojure.spec.gen.alpha :as ga]
             [clojure.string :as str]
             [clojure.test.check :as check]