tjs-lang 0.6.45 → 0.7.4

package/src/lang/transpiler.test.ts

@@ -18,7 +18,7 @@ describe('TJS Emitter', () => {
 
     it('should preserve return type annotation in metadata', () => {
       const result = transpileToJS(`
-        function add(a: 0, b: 0) -> 0 {
+        function add(a: 0, b: 0): 0 {
           return a + b
         }
       `)
@@ -76,7 +76,7 @@ describe('TJS Emitter', () => {
 
     it('should generate __tjs metadata object', () => {
       const result = transpileToJS(`
-        function greet(name: 'world') -> 'Hello, world!' {
+        function greet(name: 'world'): 'Hello, world!' {
           return \`Hello, \${name}!\`
         }
       `)
@@ -192,7 +192,7 @@ function greet(name: 'world') {
     it('should handle object return type', () => {
       // Object types are valid return types
       const result = transpileToJS(`
-        function test(x: 0) -> { result: 0 } {
+        function test(x: 0): { result: 0 } {
           return { result: x }
         }
       `)
@@ -205,7 +205,7 @@ function greet(name: 'world') {
   describe('Unsafe functions with (!) syntax', () => {
     it('should mark function as unsafe when using (!) syntax', () => {
       const result = transpileToJS(`
-        function fastAdd(! a: 0, b: 0) -> 0 {
+        function fastAdd(! a: 0, b: 0): 0 {
           return a + b
         }
       `)
@@ -214,7 +214,7 @@ function greet(name: 'world') {
 
     it('should NOT mark function as unsafe without (!) syntax', () => {
       const result = transpileToJS(`
-        function safeAdd(a: 0, b: 0) -> 0 {
+        function safeAdd(a: 0, b: 0): 0 {
           return a + b
         }
       `)
@@ -251,7 +251,7 @@ function greet(name: 'world') {
 
     it('should preserve type metadata for unsafe functions', () => {
       const result = transpileToJS(`
-        function compute(! x: 0, y: 'str') -> 0 {
+        function compute(! x: 0, y: 'str'): 0 {
           return x
         }
       `)
@@ -280,8 +280,8 @@ function greet(name: 'world') {
 
     it('should handle multiple functions', () => {
       const result = transpileToJS(`
-        function add(a: 0, b: 0) -> 0 { return a + b }
-        function mul(a: 0, b: 0) -> 0 { return a * b }
+        function add(a: 0, b: 0): 0 { return a + b }
+        function mul(a: 0, b: 0): 0 { return a * b }
       `)
 
       expect(result.code).toContain('add.__tjs')
@@ -293,7 +293,7 @@ function greet(name: 'world') {
 
     it('should insert __tjs immediately after each function', () => {
       const result = transpileToJS(`
-        function greet(name: 'World') -> 'Hello, World' { return 'Hello, ' + name }
+        function greet(name: 'World'): 'Hello, World' { return 'Hello, ' + name }
         console.log(greet.__tjs)
       `)
 
@@ -307,7 +307,7 @@ function greet(name: 'world') {
 
     it('should compile validation inline (no wrapper)', () => {
       const result = transpileToJS(`
-        function greet(name: 'World') -> 'Hello, World' { return 'Hello, ' + name }
+        function greet(name: 'World'): 'Hello, World' { return 'Hello, ' + name }
       `)
 
       // Should NOT have wrapper pattern
@@ -324,11 +324,11 @@ function greet(name: 'world') {
       const result = transpileToJS(`
         const VERSION = '1.0'
 
-        function greet(name: 'World') -> 'Hello, World' { return 'Hello, ' + name }
+        function greet(name: 'World'): 'Hello, World' { return 'Hello, ' + name }
 
         console.log(greet.__tjs)
 
-        function add(a: 1, b: 2) -> 3 { return a + b }
+        function add(a: 1, b: 2): 3 { return a + b }
 
         console.log(add.__tjs)
       `)
@@ -373,7 +373,7 @@ function greet(name: 'world') {
     it('should handle export function with __tjs metadata', () => {
       const result = transpileToJS(
         `
-        export function add(a: 1.0, b: 2.0) -> 3.0 {
+        export function add(a: 1.0, b: 2.0): 3.0 {
           return a + b
         }
       `,
@@ -389,7 +389,7 @@ function greet(name: 'world') {
     it('should handle export default function with __tjs metadata', () => {
       const result = transpileToJS(
         `
-        export default function greet(name: 'World') -> '' {
+        export default function greet(name: 'World'): '' {
           return 'Hello, ' + name
         }
       `,
@@ -405,11 +405,11 @@ function greet(name: 'world') {
         `
         import { helper } from './utils.tjs'
 
-        function internal(x: 0) -> 0 {
+        function internal(x: 0): 0 {
           return x * 2
         }
 
-        export function api(y: 0) -> 0 {
+        export function api(y: 0): 0 {
           return internal(helper(y))
         }
       `,
@@ -444,7 +444,7 @@ function greet(name: 'world') {
     it('should generate inline validation for exported functions', () => {
       const result = transpileToJS(
         `
-        export function add(a: 0, b: 0) -> 0 {
+        export function add(a: 0, b: 0): 0 {
           return a + b
         }
       `,
@@ -462,13 +462,13 @@ function greet(name: 'world') {
 # Example
 
 \`\`\`javascript
-export function add(a: 0, b: 0) -> 0 {
+export function add(a: 0, b: 0): 0 {
   return a + b
 }
 \`\`\`
 */
 
-function realFunction(x: 5) -> 10 {
+function realFunction(x: 5): 10 {
   return x * 2
 }
       `,
@@ -493,7 +493,7 @@ add.__tjs = { params: { a: { type: { kind: 'number' } }, b: { type: { kind: 'num
       const mainSource = `
 import { add } from 'mymath'
 
-function doubleAdd(x: 5) -> 20 {
+function doubleAdd(x: 5): 20 {
   return add(x, x) * 2
 }
 `
@@ -521,7 +521,7 @@ multiply.__tjs = { params: { a: { type: { kind: 'number' } }, b: { type: { kind:
       const mainSource = `
 import { multiply } from 'mymath'
 
-function square(x: 0) -> 0 {
+function square(x: 0): 0 {
   return multiply(x, x)
 }
 

package/src/lang/typescript-syntax.test.ts

@@ -155,7 +155,7 @@ describe('Union Types', () => {
 
   test('union return type with | (nullable object)', () => {
     const { metadata } = transpileToJS(`
-      function find(id: 0) -! { name: '' } | null {
+      function find(id: 0):! { name: '' } | null {
         return null
       }
     `)
@@ -228,7 +228,7 @@ describe('Return Types', () => {
   test('simple return type', () => {
     // Use -! to skip signature test (testing metadata, not return value match)
     const { metadata } = transpileToJS(`
-      function greet(name: '') -! '' {
+      function greet(name: ''):! '' {
         return 'Hello, ' + name
       }
     `)
@@ -238,7 +238,7 @@ describe('Return Types', () => {
   test('object return type', () => {
     // Use -! to skip signature test (testing metadata, not return value match)
     const { metadata } = transpileToJS(`
-      function makeUser(name: '') -! { name: '', id: 0 } {
+      function makeUser(name: ''):! { name: '', id: 0 } {
         return { name, id: 1 }
       }
     `)
@@ -248,7 +248,7 @@ describe('Return Types', () => {
 
   test('array return type', () => {
     const { metadata } = transpileToJS(`
-      function toArray(item: '') -> [''] {
+      function toArray(item: ''): [''] {
         return [item]
       }
     `)
@@ -258,7 +258,7 @@ describe('Return Types', () => {
 
   test('nested array return ([[x]])', () => {
     const { metadata } = transpileToJS(`
-      function chunk(items: [''], size: 1) -> [['']] {
+      function chunk(items: [''], size: 1): [['']] {
         const result = []
         for (let i = 0; i < items.length; i += size) {
           result.push(items.slice(i, i + size))
@@ -628,6 +628,7 @@ describe('Class Syntax', () => {
     const { transpile } = require('./index')
     expect(() =>
       transpile(`
+      TjsCompat
       class Greeter {
         greet() {
           return 'Hello'
@@ -854,7 +855,8 @@ describe('Real-World Patterns', () => {
     }).code
     // TJS should have union annotation
     expect(tjsCode).toContain('excited: false | undefined')
-    const jsResult = tjs(tjsCode)
+    // TS-originated code defaults to safety none — add safety inputs to test validation
+    const jsResult = tjs('safety inputs\n' + tjsCode)
     // JS should not have default or bitwise OR — `:` means required
     expect(jsResult.code).not.toMatch(/excited = false/)
     expect(jsResult.code).not.toMatch(/excited = false \| undefined/)
@@ -898,7 +900,7 @@ describe('fromTS generators', () => {
       emitTJS: true,
     })
     // Return annotation should be the yield type (number -> 0.0)
-    expect(result.code).toContain('-!')
+    expect(result.code).toContain(':!')
     expect(result.code).toContain('0.0')
   })
 
@@ -907,7 +909,7 @@ describe('fromTS generators', () => {
       "async function* words(): AsyncGenerator<string> { yield 'hi' }",
       { emitTJS: true }
     )
-    expect(result.code).toContain('-!')
+    expect(result.code).toContain(':!')
     expect(result.code).toMatch(/''/)
   })
 
@@ -1645,7 +1647,7 @@ describe('DOM Types', () => {
       { emitTJS: true }
     )
     // Return type should be {} not degraded
-    expect(result.code).toContain('-! {}')
+    expect(result.code).toContain(':! {}')
   })
 
   test('DOM callback type preserves annotation', () => {

package/src/types/Type.ts

@@ -16,7 +16,8 @@
  *   ZipCode.description // '5-digit US zip code'
  */
 
-import { validate, s, type Base } from 'tosijs-schema'
+import { validate, filter as schemaFilter, s, type Base } from 'tosijs-schema'
+import { exampleToJSONSchema, type JSONSchemaObject } from '../lang/json-schema'
 
 /** JSON Schema object type (simplified) */
 type JSONSchema = {
@@ -46,6 +47,10 @@ export interface RuntimeType<T = unknown> {
   readonly examples?: T[]
   /** Default value (for instantiation) */
   readonly default?: T
+  /** Generate JSON Schema for this type */
+  toJSONSchema(): JSONSchemaObject
+  /** Strip a value down to only the fields matching this type's schema */
+  strip(value: unknown): unknown
   /** Brand for type identification */
   readonly __runtimeType: true
 }
@@ -189,6 +194,28 @@ export function Type<T = unknown>(
     example,
     examples,
     default: defaultValue,
+    toJSONSchema(): JSONSchemaObject {
+      // If we have an underlying JSON Schema or builder, extract it
+      if (schema) {
+        const raw = (schema as any)?.schema ?? schema
+        if (raw && typeof raw === 'object' && 'type' in raw) {
+          return raw as JSONSchemaObject
+        }
+      }
+      // Fall back to inferring from example
+      if (example !== undefined) {
+        return exampleToJSONSchema(example)
+      }
+      // Predicate-only types: best-effort from description
+      return { description }
+    },
+    strip(value: unknown): unknown {
+      if (schema) {
+        return schemaFilter(value, schema)
+      }
+      // No schema — can't strip, return as-is
+      return value
+    },
     __runtimeType: true as const,
   }
 }
@@ -386,6 +413,10 @@ export function Union<T extends unknown[]>(
     const result: RuntimeType & { values: unknown[] } = {
       description,
       check: (v: unknown): v is T[number] => valueSet.has(v),
+      toJSONSchema: () => ({
+        enum: values,
+      }),
+      strip: (value: unknown) => value,
       __runtimeType: true as const,
       values, // Expose values for introspection
     }
@@ -599,6 +630,10 @@ export function Enum<T extends Record<string, string | number>>(
   const enumType: EnumType<T> = {
     description,
     check: (v: unknown): v is T[keyof T] => valueSet.has(v as T[keyof T]),
+    toJSONSchema: () => ({
+      enum: values as unknown[],
+    }),
+    strip: (value: unknown) => value,
     __runtimeType: true as const,
     members,
     names,
@@ -783,6 +818,8 @@ function _createFunctionPredicate(
     params,
     returns,
     returnContract,
+    toJSONSchema: () => ({ description: name, type: 'function' as any }),
+    strip: (value: unknown) => value,
     // eslint-disable-next-line @typescript-eslint/ban-types
     check: (value: unknown): value is Function => {
       if (typeof value !== 'function') return false

package/src/use-cases/bootstrap.test.ts

@@ -151,11 +151,11 @@ describe('Bootstrap Canary', () => {
         Basic arithmetic operations.
         */
 
-        function add(a: 0, b: 0) -> 0 {
+        function add(a: 0, b: 0): 0 {
           return a + b
         }
 
-        function multiply(x: 1, y: 1) -> 1 {
+        function multiply(x: 1, y: 1): 1 {
           return x * y
         }
       `)
@@ -182,14 +182,14 @@ describe('Bootstrap Canary', () => {
 
       // A self-contained TJS test
       const tjsSource = `
-        function add(a: 0, b: 0) -> 0 {
+        function add(a: 0, b: 0): 0 {
           return a + b
         }
         /* @test add(1, 2) is 3 */
         /* @test add(-1, 1) is 0 */
         /* @test add(0, 0) is 0 */
 
-        function greet(name: 'World') -> 'Hello, World!' {
+        function greet(name: 'World'): 'Hello, World!' {
           return 'Hello, ' + name + '!'
         }
         /* @test greet('TJS') is 'Hello, TJS!' */
@@ -541,7 +541,7 @@ describe('Bootstrap Canary', () => {
 
       // Test colon shorthand -> default params
       const result1 = parserModule.preprocess(`
-        function greet(name: 'World') -> '' {
+        function greet(name: 'World'): '' {
           return 'Hello, ' + name + '!'
         }
       `)
@@ -550,7 +550,7 @@ describe('Bootstrap Canary', () => {
 
       // Test arrow return type extraction
       const result2 = parserModule.preprocess(`
-        function add(a: 0, b: 0) -> 0 {
+        function add(a: 0, b: 0): 0 {
           return a + b
         }
       `)
@@ -650,7 +650,7 @@ describe('Bootstrap Canary', () => {
       // Test cases - various TJS syntax
       const testCases = [
         `function f(x: 0) { return x }`,
-        `function g(a: '', b = 1) -> '' { return a }`,
+        `function g(a: '', b = 1): '' { return a }`,
         `function h(! fast: 0) { return fast }`,
         `Type Foo { example: { x: 0 } }`,
         `Generic Bar<T> { predicate(x, T) { return true } }`,

package/src/use-cases/client-server.test.ts

@@ -78,7 +78,7 @@ describe('Use Case: Client-Server', () => {
     }
 
     // 3. Verify
-    // store.get('secret_id') -> 'Server Value for secret_id'
+    // store.get('secret_id'): 'Server Value for secret_id'
     // template -> 'Echo: Server Value for secret_id'
     expect(response.status).toBe(200)
     expect(data.result).toEqual({

package/src/use-cases/malicious-actor.test.ts

@@ -20,7 +20,7 @@ describe('Use Case: Malicious Actor', () => {
     expect(result.error).toBeDefined()
     expect(result.error?.message).toBe('Out of Fuel')
 
-    // 2. Run with enough fuel (simulated) -> Should fail eventually or return if limited loops
+    // 2. Run with enough fuel (simulated): Should fail eventually or return if limited loops
     // In this case condition is always true, so it loops forever.
     // Even with 1000000 fuel, it will exhaust it.
   })

package/src/use-cases/rag-processor.test.ts

@@ -101,7 +101,7 @@ describe('Use Case: RAG Processor', () => {
         // We need robust resolve?
         // Since we can't import resolveValue, we rely on ctx.capabilities.llm.embed
         // But wait, 'text' in step might be 'args.query' string if resolved by builder?
-        // Builder: Agent.args('query') -> { $kind: 'arg', path: 'query' }
+        // Builder: Agent.args('query'): { $kind: 'arg', path: 'query' }
         // So step.text is that object.
         // We need resolveValue logic.
         // But I can't import resolveValue.

package/src/use-cases/sophisticated-agents.test.ts

@@ -86,8 +86,8 @@ describe('Use Case: Sophisticated Agents', () => {
     )
 
     expect(result.result.answer).toBe('A')
-    // Attempt 0: "Paris" (Invalid) -> attempts becomes 1
-    // Attempt 1: "A" (Valid) -> success
+    // Attempt 0: "Paris" (Invalid): attempts becomes 1
+    // Attempt 1: "A" (Valid): success
     // So attempts variable ends at 1.
     expect(result.result.attempts).toBe(1)
     expect(caps.llmBattery.predict).toHaveBeenCalledTimes(2)

package/src/use-cases/transpiler-llm.test.ts

@@ -78,7 +78,7 @@ function fixCommonMistakes(code: string): string {
   )
 
   // Fix TypeScript-style type annotations on parameters
-  // e.g., (x: string) -> (x: 'example') or (x: number) -> (x: 0)
+  // e.g., (x: string): (x: 'example') or (x: number): (x: 0)
   // Only do this for standalone type keywords, not example values
   code = code.replace(/:\s*string\b(?!\s*[=)])/g, ": ''")
   code = code.replace(/:\s*number\b(?!\s*[=)])/g, ': 0')

package/src/use-cases/unbundled-imports.test.ts

@@ -33,7 +33,7 @@ describe('Unbundled transitive imports', () => {
   it('should share runtime across files importing each other', async () => {
     // File A: exports a validated function
     const aSource = `
-      export function double(x: 0) -! 0 {
+      export function double(x: 0):! 0 {
         return x * 2
       }
     `
@@ -43,7 +43,7 @@ describe('Unbundled transitive imports', () => {
     const bSource = `
       import { double } from './a.js'
 
-      export function quadruple(x: 0) -! 0 {
+      export function quadruple(x: 0):! 0 {
         return double(double(x))
       }
     `
@@ -63,7 +63,7 @@ describe('Unbundled transitive imports', () => {
   it('should propagate MonadicError across file boundaries', async () => {
     // File C: validates input
     const cSource = `
-      export function validateName(name: '') -! '' {
+      export function validateName(name: ''):! '' {
         return name.trim()
       }
     `
@@ -73,7 +73,7 @@ describe('Unbundled transitive imports', () => {
     const dSource = `
       import { validateName } from './c.js'
 
-      export function greetUser(name: '') -! '' {
+      export function greetUser(name: ''):! '' {
         const clean = validateName(name)
         if (clean instanceof Error) return clean
         return 'Hello, ' + clean + '!'
@@ -131,11 +131,11 @@ describe('Unbundled transitive imports', () => {
   it('should not create duplicate MonadicError classes at runtime', async () => {
     // Both files have inline MonadicError but should use shared runtime
     const e1Source = `
-      export function check1(x: '') -! '' { return x }
+      export function check1(x: ''):! '' { return x }
     `
     const e2Source = `
       import { check1 } from './e1.js'
-      export function check2(x: '') -! '' { return check1(x) }
+      export function check2(x: ''):! '' { return check1(x) }
     `
 
     writeFileSync(join(TEMP_DIR, 'e1.js'), tjs(e1Source).code)
@@ -150,14 +150,14 @@ describe('Unbundled transitive imports', () => {
   })
 
   it('should handle three-level import chains', async () => {
-    const l1 = `export function inc(x: 0) -! 0 { return x + 1 }`
+    const l1 = `export function inc(x: 0):! 0 { return x + 1 }`
     const l2 = `
       import { inc } from './l1.js'
-      export function incTwice(x: 0) -! 0 { return inc(inc(x)) }
+      export function incTwice(x: 0):! 0 { return inc(inc(x)) }
     `
     const l3 = `
       import { incTwice } from './l2.js'
-      export function incFour(x: 0) -! 0 { return incTwice(incTwice(x)) }
+      export function incFour(x: 0):! 0 { return incTwice(incTwice(x)) }
     `
 
     writeFileSync(join(TEMP_DIR, 'l1.js'), tjs(l1).code)

package/tjs-lang.svg

@@ -1,31 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg x="0pt" y="0pt" width="48pt" height="48pt" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg x="0px" y="0px" width="48px" height="48px" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <!--Generated by AMDN-->
-  <g id="Layer_1">
-    <g id="Layer_1-1">
-      <g id="Layer_1_1">
-        <g id="Group">
-          <path id="Path" style="fill:#ff1c24;fill-opacity:1;fill-rule:evenodd;opacity:1;stroke:none;" d="M1,9 C1,4.58172,4.58172,1,9,1 C9,1,39,1,39,1 C43.4183,1,47,4.58172,47,9 C47,9,47,39,47,39 C47,43.4183,43.4183,47,39,47 C39,47,9,47,9,47 C4.58172,47,1,43.4183,1,39 C1,39,1,9,1,9 z"/>
-          <g id="Group_1">
-            <path id="Path_1" style="fill:#9e9e9e;fill-opacity:1;fill-rule:nonzero;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M16,29 C16,29,10,31,10,35 C10,39,16,39,16,39"/>
-            <path id="Path_Copy" style="fill:#9e9e9e;fill-opacity:1;fill-rule:nonzero;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M32.0002,29 C32.0002,29,38.0002,31,38.0002,35 C38.0002,39,32.0002,39,32.0002,39"/>
-            <path id="Path_2" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M9,10.1818 C9,7.87226,10.7909,6,13,6 C13,6,35,6,35,6 C37.2091,6,39,7.87226,39,10.1818 C39,10.1818,39,24.8182,39,24.8182 C39,27.1277,37.2091,29,35,29 C35,29,13,29,13,29 C10.7909,29,9,27.1277,9,24.8182 C9,24.8182,9,10.1818,9,10.1818 z"/>
-            <path id="Path_3" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M24,11 C24,11,24,23,24,23"/>
-            <path id="Path_4" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M28,15 C28,15,28,17,28,17"/>
-            <path id="Path_Copy_1" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M20,15 C20,15,20,17,20,17"/>
-            <path id="Path_5" style="fill:none;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M32,43 C32,43,30,41,30,41 C30,41,28,43,28,43"/>
-            <path id="Path_Copy_2" style="fill:none;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M20,43 C20,43,18,41,18,41 C18,41,16,43,16,43"/>
-            <path id="Path_6" style="fill:#e4e4e4;fill-opacity:1;fill-rule:evenodd;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M16,29 C16,29,32,29,32,29 C32,29,32,39,32,39 C32,39,16,39,16,39 C16,39,16,29,16,29 z"/>
-          </g>
-        </g>
+  <g id="Layer 1">
+    <g id="Group">
+      <g id="Group">
+        <path id="Path 17" style="fill:#3ea9f5;fill-opacity:1;fill-rule:evenodd;opacity:1;stroke:none;" d="M23.9725,47 C23.9725,47,39,47,39,47 C43.4183,47,47,43.4183,47,39 C47,39,47,9,47,9 C47,4.58172,43.4183,1,39,1 C39,1,9,1,9,1 C4.58172,1,1,4.58172,1,9 C1,9,1,39,1,39 C1,41.6412,2.27995,43.9835,4.25342,45.4404 C4.08812,44.8215,4,44.171,4,43.5 C4,39.3579,7.35786,36,11.5,36 C15.1444,36,18.1817,38.5994,18.859,42.0453 C19.0684,42.0154,19.2824,42,19.5,42 C21.9853,42,24,44.0147,24,46.5 C24,46.669,23.9907,46.8358,23.9725,47 z"/>
+        <path id="Path 18" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;opacity:1;stroke:none;" d="M4.25342,45.4404 C4.08812,44.8215,4,44.171,4,43.5 C4,39.3579,7.35786,36,11.5,36 C15.1444,36,18.1817,38.5994,18.859,42.0453 C19.0684,42.0154,19.2824,42,19.5,42 C21.9853,42,24,44.0147,24,46.5 C24,46.669,23.9907,46.8358,23.9725,47 C23.9725,47,9,47,9,47 C7.22294,47,5.58121,46.4206,4.25342,45.4404 z"/>
+      </g>
+      <path id="Path" style="fill:none;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M35,35 C35,35,32.1716,35,32.1716,35 C32.1716,35,32.1716,37.8284,32.1716,37.8284"/>
+      <path id="Path Copy" style="fill:none;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M31,39 C31,39,28.1716,39,28.1716,39 C28.1716,39,28.1716,41.8284,28.1716,41.8284"/>
+      <path id="Path Copy" style="fill:#9e9e9e;fill-opacity:1;fill-rule:nonzero;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M7.48047,16 C4.45369,16,2,18.4537,2,21.4805 C2,21.4805,2,21.4805,2,21.4805 C2,23.9765,4.02346,26,6.51953,26 C6.51953,26,6.61997,26,6.61997,26 C7.38213,26,8,26.6179,8,27.38 C8,27.38,8,27.38,8,27.38 C8,29.9316,10.0684,32,12.62,32 C12.62,32,16,32,16,32 C18.5834,32,20.6777,29.9057,20.6777,27.3223 C20.6777,27.3223,20.6777,21.4215,20.6777,21.4215 C20.6777,18.4273,18.2504,16,15.2561,16 C15.2561,16,7.48047,16,7.48047,16 z"/>
+      <path id="Path" style="fill:#e4e4e4;fill-opacity:1;fill-rule:evenodd;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M17,29 C17,29,33,29,33,29 C33,29,33,29,33,29 C33,34.5228,28.5228,39,23,39 C23,39,23,39,23,39 C19.6863,39,17,36.3137,17,33 C17,33,17,29,17,29 z"/>
+      <path id="Path Copy" style="fill:#9e9e9e;fill-opacity:1;fill-rule:nonzero;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M40.5195,16 C43.5463,16,46,18.4537,46,21.4805 C46,21.4805,46,21.4805,46,21.4805 C46,23.9765,43.9765,26,41.4805,26 C41.4805,26,41.38,26,41.38,26 C40.6179,26,40,26.6179,40,27.38 C40,27.38,40,27.38,40,27.38 C40,29.9316,37.9316,32,35.38,32 C35.38,32,32,32,32,32 C29.4166,32,27.3223,29.9057,27.3223,27.3223 C27.3223,27.3223,27.3223,21.4215,27.3223,21.4215 C27.3223,18.4273,29.7496,16,32.7439,16 C32.7439,16,40.5195,16,40.5195,16 z"/>
+      <g id="Group">
+        <path id="Path" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M6,10.1818 C6,7.87226,7.79086,6,10,6 C10,6,32,6,32,6 C34.2091,6,36,7.87226,36,10.1818 C36,10.1818,36,24.8182,36,24.8182 C36,27.1277,34.2091,29,32,29 C32,29,10,29,10,29 C7.79086,29,6,27.1277,6,24.8182 C6,24.8182,6,10.1818,6,10.1818 z"/>
+        <path id="Path" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M21,11 C21,11,21,23,21,23"/>
+        <path id="Path" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M25,15 C25,15,25,17,25,17"/>
+        <path id="Path Copy" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M17,15 C17,15,17,17,17,17"/>
       </g>
     </g>
-    <path id="Path-1" style="fill:#006736;fill-opacity:1;fill-rule:evenodd;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M27,17 C27,17,34,17,34,17 C34,17,34,22,34,22 C34,22,27,22,27,22 C27,22,27,17,27,17 z"/>
-    <path id="Path-2" style="fill:none;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M21,19 C21,19,21,19,21,19 C21,17.8954,21.8954,17,23,17 C23,17,25,17,25,17 C26.1046,17,27,17.8954,27,19 C27,19,27,19,27,19"/>
-    <path id="Path_Copy-1" style="fill:#006736;fill-opacity:1;fill-rule:evenodd;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M14,17 C14,17,21,17,21,17 C21,17,21,22,21,22 C21,22,14,22,14,22 C14,22,14,17,14,17 z"/>
-    <path id="Path_Copy-2" style="fill:#8e7f6d;fill-opacity:1;fill-rule:nonzero;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M7.31734,20.5867 C7.14208,19.7104,7.71038,18.8579,8.58668,18.6827 C8.58668,18.6827,10.4133,18.3173,10.4133,18.3173 C11.2896,18.1421,12.1421,18.7104,12.3173,19.5867 C12.3173,19.5867,12.6405,21.2026,12.6405,21.2026 C12.8314,22.157,13.8156,22.7281,14.7389,22.4204 C14.7389,22.4204,15.1785,22.2738,15.1785,22.2738 C15.6917,22.1028,16.2565,22.1995,16.6836,22.5317 C16.6836,22.5317,24.3753,28.5141,24.3753,28.5141 C24.7695,28.8207,25,29.2921,25,29.7914 C25,29.7914,25,40.3298,25,40.3298 C25,40.7589,24.8295,41.1705,24.5261,41.4739 C24.5261,41.4739,23.4739,42.5261,23.4739,42.5261 C23.1705,42.8295,22.7589,43,22.3298,43 C22.3298,43,9,43,9,43 C7.34315,43,6,41.6569,6,40 C6,40,6,26,6,26 C6,25.3871,6.3463,24.8268,6.89452,24.5527 C6.89452,24.5527,6.89452,24.5527,6.89452,24.5527 C7.5472,24.2264,7.90073,23.5036,7.75762,22.7881 C7.75762,22.7881,7.31734,20.5867,7.31734,20.5867 z"/>
-    <path id="Compound_Group" style="fill:#c6b199;fill-opacity:1;fill-rule:evenodd;opacity:1;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M21.118,26.0132 C21.118,26.0132,29.4076,27.8928,29.4076,27.8928 C30.2155,28.076,30.722,28.8794,30.5388,29.6874 C30.5388,29.6874,28.3275,39.4398,28.3275,39.4398 C28.1443,40.2477,27.3409,40.7542,26.5329,40.571 C26.5329,40.571,10.929,37.0329,10.929,37.0329 C10.1211,36.8498,9.61466,36.0463,9.79785,35.2384 C9.79785,35.2384,12.2302,24.5107,12.2302,24.5107 C12.2302,24.5107,12.6725,22.5602,12.6725,22.5602 C12.8557,21.7523,13.6591,21.2458,14.4671,21.429 C14.4671,21.429,20.3185,22.7558,20.3185,22.7558 C21.1264,22.939,21.6329,23.7424,21.4497,24.5503 C21.4497,24.5503,21.118,26.0132,21.118,26.0132 z"/>
-    <path id="Path-3" style="fill:#8e7f6d;fill-opacity:1;fill-rule:nonzero;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M41,19 C41,19,36,18,36,18 C36,18,35,23,35,23 C35,23,32,22,32,22 C32,22,23,29,23,29 C23,29,23,41,23,41 C23,41,25,43,25,43 C25,43,39,43,39,43 C40.6569,43,42,41.6569,42,40 C42,40,42,25,42,25 C42,25,40,24,40,24 C40,24,41,19,41,19 z"/>
-    <path id="Path-4" style="fill:#8e7f6d;fill-opacity:1;fill-rule:nonzero;opacity:1;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-width:2;" d="M13.2766,3.05029 C13.1062,3.01931,12.9326,3.08429,12.8244,3.21952 C12.8244,3.21952,9,8,9,8 C9,8,6.05462,8.58908,6.05462,8.58908 C5.56174,8.68765,5.54512,9.38628,6.03275,9.50819 C6.03275,9.50819,24,14,24,14 C24,14,41.9672,9.50819,41.9672,9.50819 C42.4549,9.38628,42.4383,8.68765,41.9454,8.58908 C41.9454,8.58908,39,8,39,8 C39,8,35.1756,3.21952,35.1756,3.21952 C35.0674,3.08429,34.8938,3.01931,34.7234,3.05029 C34.7234,3.05029,24,5,24,5 C24,5,13.2766,3.05029,13.2766,3.05029 z"/>
   </g>
 </svg>