Fix python optional bug and ttl ms (#70)

* fix python optional payload

* cli ttl ms

* Update ttl to ttl_ms

* Update docs

* Fix format

* Fix lint

Author: unimonkiez

cli/schema.memorix

@@ -47,7 +47,7 @@ Namespace standalone {
         id: u32
         other_id: u64
       }
-      ttl: env(ABC_TTL)
+      ttl_ms: env(ABC_TTL)
       public: [
         get
         set

cli/src/export_schema.rs

@@ -30,7 +30,7 @@ pub struct ExportNamespace {
 pub struct ExportCacheItem<T> {
     pub key: Option<T>,
     pub payload: T,
-    pub ttl: Option<Value>,
+    pub ttl_ms: Option<Value>,
     pub extend_on_get: Option<Value>,
     pub expose: Vec<CacheOperation>,
 }
@@ -105,7 +105,7 @@ fn namespace_to_export_namespace(namespace: &Namespace, expose_all: bool) -> Exp
                             key: x.key,
                             payload: x.payload,
                             expose: v,
-                            ttl: x.ttl,
+                            ttl_ms: x.ttl_ms,
                             extend_on_get: x.extend_on_get,
                         },
                     )

cli/src/flat_schema.rs

@@ -162,7 +162,7 @@ fn namespace_to_flat_namespace(
                         &mut type_object_items,
                     ),
                     expose: x.expose.clone(),
-                    ttl: x.ttl.clone(),
+                    ttl_ms: x.ttl_ms.clone(),
                     extend_on_get: x.extend_on_get.clone(),
                 },
             )

cli/src/languages/python.rs

@@ -198,9 +198,9 @@ fn namespace_to_code(
                             .join(""),
                         options = {
                             let content = [
-                                item.ttl.as_ref().map(|x| {
+                                item.ttl_ms.as_ref().map(|x| {
                                     format!(
-                                        "{base_indent}                ttl={},",
+                                        "{base_indent}                ttl_ms={},",
                                         value_to_code(x)
                                     )
                                 }),

cli/src/languages/rust.rs

@@ -201,8 +201,8 @@ fn namespace_to_code(
 {base_indent}                }})"#,
                         content = [
                             format!(
-                                "{base_indent}                    ttl: {},",
-                                item.ttl.as_ref().map_or("None".to_string(), |x| format!(
+                                "{base_indent}                    ttl_ms: {},",
+                                item.ttl_ms.as_ref().map_or("None".to_string(), |x| format!(
                                     "Some({})",
                                     value_to_code(x)
                                 ))

cli/src/languages/typescript.rs

@@ -184,8 +184,8 @@ super_call= match name_tree.is_empty() {
                                     .join(", "),
                                     options = {
                                         let content = [
-                                            item.ttl.as_ref().map(|x| format!(
-                                                "{base_indent}      ttl: {},",value_to_code(x))),
+                                            item.ttl_ms.as_ref().map(|x| format!(
+                                                "{base_indent}      ttl_ms: {},",value_to_code(x))),
                                             item.extend_on_get.as_ref().map(|x| format!(
                                                     "{base_indent}      extendOnGet: {},",value_to_code(x))),
                                         ]

cli/src/main.rs

@@ -375,7 +375,7 @@ Cache {
       session_token: string
       expiry: u64
     }
-    ttl: env(USER_SESSION_TTL)
+    ttl_ms: env(USER_SESSION_TTL_MS)
   }
 }
   
@@ -401,7 +401,7 @@ Namespace UserService {
         session_token: string
         expiry: u64
       }
-      ttl: env(USER_SESSION_TTL)
+      ttl_ms: env(USER_SESSION_TTL_MS)
     }
   }
 
@@ -499,7 +499,7 @@ Type {
         how_many_atoms: {
           payload: u32
           key: u64
-          ttl:   env(  TTL_HOW_MANY_ATOMS  )
+          ttl_ms:   env(  TTL_MS_HOW_MANY_ATOMS  )
         }
       }
       PubSub {

cli/src/parser.rs

@@ -135,15 +135,15 @@ pub struct EnumItem {
 pub struct CacheItem {
     pub key: Option<TypeItem>,
     pub payload: TypeItem,
-    pub ttl: Option<Value>,
+    pub ttl_ms: Option<Value>,
     pub extend_on_get: Option<Value>,
     pub public: Option<Vec<CacheOperation>>,
 }
 impl_from_and_to_sdl_for_struct! {
     (CacheItem, 5),
     (key: TypeItem, 0, false),
     (payload: TypeItem, 1, true),
-    (ttl: Value, 2, false),
+    (ttl_ms: Value, 2, false),
     (extend_on_get: Value, 3, false),
     (public: Vec<CacheOperation>, 4, false),
 }