Fix web lex

Author: abnegate

src/SDK/Language/CLI.php

@@ -434,14 +434,6 @@ public function getParamExample(array $param): string
         return $output;
     }
 
-    public function getFilters(): array
-    {
-        return array_merge(parent::getFilters(), [
-            new TwigFilter('caseKebab', function ($value) {
-                return strtolower(preg_replace('/(?<!^)([A-Z][a-z]|(?<=[a-z])[^a-z\s]|(?<=[A-Z])[0-9_])/', '-$1', $value));
-            })
-        ]);
-    }
     /**
      * Language specific filters.
      * @return array

src/SDK/Language/JS.php

@@ -210,6 +210,9 @@ public function getFilters(): array
             new TwigFilter('caseEnumKey', function (string $value) {
                 return $this->toPascalCase($value);
             }),
+            new TwigFilter('caseKebab', function ($value) {
+                return strtolower(preg_replace('/(?<!^)([A-Z][a-z]|(?<=[a-z])[^a-z\s]|(?<=[A-Z])[0-9_])/', '-$1', $value));
+            })
         ];
     }
 }

src/SDK/Language/Node.php

@@ -195,7 +195,7 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'service',
-                'destination'   => 'src/services/{{service.name | caseDash}}.ts',
+                'destination'   => 'src/services/{{service.name | caseKebab}}.ts',
                 'template'      => 'node/src/services/template.ts.twig',
             ],
             [
@@ -245,7 +245,7 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'method',
-                'destination'   => 'docs/examples/{{service.name | caseLower}}/{{method.name | caseDash}}.md',
+                'destination'   => 'docs/examples/{{service.name | caseLower}}/{{method.name | caseKebab}}.md',
                 'template'      => 'node/docs/example.md.twig',
             ],
             [
@@ -265,7 +265,7 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'enum',
-                'destination'   => 'src/enums/{{ enum.name | caseDash }}.ts',
+                'destination'   => 'src/enums/{{ enum.name | caseKebab }}.ts',
                 'template'      => 'web/src/enums/enum.ts.twig',
             ],
         ];

src/SDK/Language/ReactNative.php

@@ -37,7 +37,7 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'service',
-                'destination'   => 'src/services/{{service.name | caseDash}}.ts',
+                'destination'   => 'src/services/{{service.name | caseKebab}}.ts',
                 'template'      => 'react-native/src/services/template.ts.twig',
             ],
             [
@@ -87,7 +87,7 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'method',
-                'destination'   => 'docs/examples/{{service.name | caseLower}}/{{method.name | caseDash}}.md',
+                'destination'   => 'docs/examples/{{service.name | caseLower}}/{{method.name | caseKebab}}.md',
                 'template'      => 'react-native/docs/example.md.twig',
             ],
             [
@@ -117,7 +117,7 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'enum',
-                'destination'   => 'src/enums/{{ enum.name | caseDash }}.ts',
+                'destination'   => 'src/enums/{{ enum.name | caseKebab }}.ts',
                 'template'      => 'react-native/src/enums/enum.ts.twig',
             ],
         ];

src/SDK/Language/Web.php

@@ -37,7 +37,7 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'service',
-                'destination'   => 'src/services/{{service.name | caseDash}}.ts',
+                'destination'   => 'src/services/{{service.name | caseKebab}}.ts',
                 'template'      => 'web/src/services/template.ts.twig',
             ],
             [
@@ -87,7 +87,7 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'method',
-                'destination'   => 'docs/examples/{{service.name | caseLower}}/{{method.name | caseDash}}.md',
+                'destination'   => 'docs/examples/{{service.name | caseLower}}/{{method.name | caseKebab}}.md',
                 'template'      => 'web/docs/example.md.twig',
             ],
             [
@@ -117,7 +117,7 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'enum',
-                'destination'   => 'src/enums/{{ enum.name | caseDash }}.ts',
+                'destination'   => 'src/enums/{{ enum.name | caseKebab }}.ts',
                 'template'      => 'web/src/enums/enum.ts.twig',
             ],
         ];
@@ -361,7 +361,7 @@ public function getSubSchema(array $property, array $spec): string
 
     public function getFilters(): array
     {
-        return [
+        return \array_merge(parent::getFilters(), [
             new TwigFilter('getPropertyType', function ($value, $method = []) {
                 return $this->getTypeName($value, $method);
             }),
@@ -391,9 +391,6 @@ public function getFilters(): array
                 }
                 return implode("\n", $value);
             }, ['is_safe' => ['html']]),
-            new TwigFilter('caseEnumKey', function ($value) {
-                return $this->toPascalCase($value);
-            }),
-        ];
+        ]);
     }
 }

templates/deno/README.md.twig

@@ -24,7 +24,7 @@
 ## Installation
 
 ```javascript
-import * as sdk from "https://deno.land/x/{{ spec.title | caseDash }}/mod.ts";
+import * as sdk from "https://deno.land/x/{{ spec.title | caseKebab }}/mod.ts";
 ```
 
 {% if sdk.gettingStarted %}

templates/deno/mod.ts.twig

@@ -9,7 +9,7 @@ import { {{spec.title | caseUcfirst}}Exception } from "./src/exception.ts";
 import { {{service.name | caseUcfirst}} } from "./src/services/{{service.name | caseDash}}.ts";
 {% endfor %}
 {% for enum in spec.enums %}
-import { {{enum.name | caseUcfirst}} } from "./src/enums/{{enum.name | caseDash}}.ts";
+import { {{enum.name | caseUcfirst}} } from "./src/enums/{{enum.name | caseKebab}}.ts";
 {% endfor %}
 
 export {

templates/deno/src/services/service.ts.twig

@@ -42,7 +42,7 @@ import { Query } from '../query.ts';
 {% set name = parameter.name %}
 {% endif %}
 {% if name not in added %}
-import { {{ name | caseUcfirst }} } from '../enums/{{ name | caseDash }}.ts';
+import { {{ name | caseUcfirst }} } from '../enums/{{ name | caseKebab }}.ts';
 {% set added = added|merge([name]) %}
 {% endif %}
 {% endif %}

templates/node/src/index.ts.twig

@@ -1,12 +1,12 @@
 export { Client, Query, {{spec.title | caseUcfirst}}Exception } from './client';
 {% for service in spec.services %}
-export { {{service.name | caseUcfirst}} } from './services/{{service.name | caseDash}}';
+export { {{service.name | caseUcfirst}} } from './services/{{service.name | caseKebab}}';
 {% endfor %}
 export type { Models, Payload, UploadProgress } from './client';
 export type { QueryTypes, QueryTypesList } from './query';
 export { Permission } from './permission';
 export { Role } from './role';
 export { ID } from './id';
 {% for enum in spec.enums %}
-export { {{ enum.name | caseUcfirst  }} } from './enums/{{enum.name | caseDash}}';
+export { {{ enum.name | caseUcfirst  }} } from './enums/{{enum.name | caseKebab}}';
 {% endfor %}

templates/node/src/services/template.ts.twig

@@ -11,7 +11,7 @@ import type { Models } from '../models';
 {% set name = parameter.name %}
 {% endif %}
 {% if name not in added %}
-import { {{ name | caseUcfirst }} } from '../enums/{{ name | caseDash }}';
+import { {{ name | caseUcfirst }} } from '../enums/{{ name | caseKebab }}';
 {% set added = added|merge([name]) %}
 {% endif %}
 {% endif %}