Skip to content

[haskell-servant] Fix parsing of special characters#2676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 1 commit into from
May 9, 2019
Merged

[haskell-servant] Fix parsing of special characters #2676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
defaultOptions
{ omitNothingFields = True
, fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand All@@ -81,4 +85,8 @@ removeFieldLabelPrefix _ prefix =
[ {{#specialCharReplacements}}("{{&char}}", "{{&replacement}}"){{#hasMore}}
, {{/hasMore}}{{/specialCharReplacements}}
]
mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
replacer =
if forParsing
then flip T.replace
else T.replace
2 changes: 1 addition & 1 deletion samples/server/petstore/haskell-servant/.openapi-generator/VERSION
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.0.0-SNAPSHOT
4.0.0-beta3
4 changes: 2 additions & 2 deletions samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ type OpenAPIPetstoreAPI
= "pet" :> ReqBody '[JSON] Pet :> Verb 'POST 200 '[JSON] () -- 'addPet' route
:<|> "pet" :> Capture "petId" Integer :> Header "api_key" Text :> Verb 'DELETE 200 '[JSON] () -- 'deletePet' route
:<|> "pet" :> "findByStatus" :> QueryParam "status" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByStatus' route
:<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
:<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> QueryParam "maxCount" Int :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
:<|> "pet" :> Capture "petId" Integer :> Verb 'GET 200 '[JSON] Pet -- 'getPetById' route
:<|> "pet" :> ReqBody '[JSON] Pet :> Verb 'PUT 200 '[JSON] () -- 'updatePet' route
:<|> "pet" :> Capture "petId" Integer :> ReqBody '[FormUrlEncoded] FormUpdatePetWithForm :> Verb 'POST 200 '[JSON] () -- 'updatePetWithForm' route
Expand DownExpand Up@@ -174,7 +174,7 @@ data OpenAPIPetstoreBackend m = OpenAPIPetstoreBackend
{ addPet :: Pet -> m (){- ^ -}
, deletePet :: Integer -> Maybe Text -> m (){- ^ -}
, findPetsByStatus :: Maybe [Text] -> m [Pet]{- ^ Multiple status values can be provided with comma separated strings -}
, findPetsByTags :: Maybe [Text] -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
, findPetsByTags :: Maybe [Text] -> Maybe Int -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
, getPetById :: Integer -> m Pet{- ^ Returns a single pet -}
, updatePet :: Pet -> m (){- ^ -}
, updatePetWithForm :: Integer -> FormUpdatePetWithForm -> m (){- ^ -}
Expand Down
50 changes: 46 additions & 4 deletions samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
module OpenAPIPetstore.Types (
ApiResponse (..),
Category (..),
InlineObject (..),
InlineObject1 (..),
Order (..),
Pet (..),
Tag (..),
Expand DownExpand Up@@ -62,6 +64,38 @@ instance ToSchema Category where
$ removeFieldLabelPrefix False "category"


-- |
data InlineObject = InlineObject
{ inlineObjectName :: Maybe Text -- ^ Updated name of the pet
, inlineObjectStatus :: Maybe Text -- ^ Updated status of the pet
} deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject where
parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject")
instance ToJSON InlineObject where
toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject")
instance ToSchema InlineObject where
declareNamedSchema = Swagger.genericDeclareNamedSchema
$ Swagger.fromAesonOptions
$ removeFieldLabelPrefix False "inlineObject"


-- |
data InlineObject1 = InlineObject1
{ inlineObject1AdditionalMetadata :: Maybe Text -- ^ Additional data to pass to server
, inlineObject1File :: Maybe FilePath -- ^ file to upload
} deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject1 where
parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject1")
instance ToJSON InlineObject1 where
toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject1")
instance ToSchema InlineObject1 where
declareNamedSchema = Swagger.genericDeclareNamedSchema
$ Swagger.fromAesonOptions
$ removeFieldLabelPrefix False "inlineObject1"


-- | An order for a pets from the pet store
data Order = Order
{ orderId :: Maybe Integer -- ^
Expand DownExpand Up@@ -144,10 +178,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
defaultOptions
{ omitNothingFields = True
, fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand DownExpand Up@@ -190,4 +228,8 @@ removeFieldLabelPrefix _ prefix =
, ("?", "'Question_Mark")
, (">=", "'Greater_Than_Or_Equal_To")
]
mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
replacer =
if forParsing
then flip T.replace
else T.replace
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[haskell-servant] Fix parsing of special characters by f-f · Pull Request #2676 · OpenAPITools/openapi-generator · GitHub
Skip to content
[haskell-servant] Fix parsing of special characters#2676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

May 9, 2019
 Merged


[haskell-servant] Fix parsing of special characters
#2676
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand All@@ -81,4 +85,8 @@ removeFieldLabelPrefix _ prefix =
 [ {{#specialCharReplacements}}("{{&char}}", "{{&replacement}}"){{#hasMore}}
 , {{/hasMore}}{{/specialCharReplacements}}
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace

2 changes: 1 addition & 1 deletion
samples/server/petstore/haskell-servant/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.0.0-SNAPSHOT
4.0.0-beta3

4 changes: 2 additions & 2 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ type OpenAPIPetstoreAPI
 = "pet" :> ReqBody '[JSON] Pet :> Verb 'POST 200 '[JSON] () -- 'addPet' route
 :<|> "pet" :> Capture "petId" Integer :> Header "api_key" Text :> Verb 'DELETE 200 '[JSON] () -- 'deletePet' route
 :<|> "pet" :> "findByStatus" :> QueryParam "status" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByStatus' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> QueryParam "maxCount" Int :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> Capture "petId" Integer :> Verb 'GET 200 '[JSON] Pet -- 'getPetById' route
 :<|> "pet" :> ReqBody '[JSON] Pet :> Verb 'PUT 200 '[JSON] () -- 'updatePet' route
 :<|> "pet" :> Capture "petId" Integer :> ReqBody '[FormUrlEncoded] FormUpdatePetWithForm :> Verb 'POST 200 '[JSON] () -- 'updatePetWithForm' route
Expand DownExpand Up@@ -174,7 +174,7 @@ data OpenAPIPetstoreBackend m = OpenAPIPetstoreBackend
 { addPet :: Pet -> m (){- ^ -}
 , deletePet :: Integer -> Maybe Text -> m (){- ^ -}
 , findPetsByStatus :: Maybe [Text] -> m [Pet]{- ^ Multiple status values can be provided with comma separated strings -}
 , findPetsByTags :: Maybe [Text] -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , findPetsByTags :: Maybe [Text] -> Maybe Int -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , getPetById :: Integer -> m Pet{- ^ Returns a single pet -}
 , updatePet :: Pet -> m (){- ^ -}
 , updatePetWithForm :: Integer -> FormUpdatePetWithForm -> m (){- ^ -}
Expand Down

50 changes: 46 additions & 4 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
module OpenAPIPetstore.Types (
 ApiResponse (..),
 Category (..),
 InlineObject (..),
 InlineObject1 (..),
 Order (..),
 Pet (..),
 Tag (..),
Expand DownExpand Up@@ -62,6 +64,38 @@ instance ToSchema Category where
 $ removeFieldLabelPrefix False "category"


-- | 
data InlineObject = InlineObject
 { inlineObjectName :: Maybe Text -- ^ Updated name of the pet
 , inlineObjectStatus :: Maybe Text -- ^ Updated status of the pet
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject")
instance ToJSON InlineObject where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject")
instance ToSchema InlineObject where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject"


-- | 
data InlineObject1 = InlineObject1
 { inlineObject1AdditionalMetadata :: Maybe Text -- ^ Additional data to pass to server
 , inlineObject1File :: Maybe FilePath -- ^ file to upload
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject1 where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject1")
instance ToJSON InlineObject1 where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject1")
instance ToSchema InlineObject1 where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject1"


-- | An order for a pets from the pet store
data Order = Order
 { orderId :: Maybe Integer -- ^ 
Expand DownExpand Up@@ -144,10 +178,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand DownExpand Up@@ -190,4 +228,8 @@ removeFieldLabelPrefix _ prefix =
 , ("?", "'Question_Mark")
 , (">=", "'Greater_Than_Or_Equal_To")
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[haskell-servant] Fix parsing of special characters by f-f · Pull Request #2676 · OpenAPITools/openapi-generator · GitHub
Skip to content
[haskell-servant] Fix parsing of special characters#2676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

May 9, 2019
 Merged


[haskell-servant] Fix parsing of special characters
#2676
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand All@@ -81,4 +85,8 @@ removeFieldLabelPrefix _ prefix =
 [ {{#specialCharReplacements}}("{{&char}}", "{{&replacement}}"){{#hasMore}}
 , {{/hasMore}}{{/specialCharReplacements}}
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace

2 changes: 1 addition & 1 deletion
samples/server/petstore/haskell-servant/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.0.0-SNAPSHOT
4.0.0-beta3

4 changes: 2 additions & 2 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ type OpenAPIPetstoreAPI
 = "pet" :> ReqBody '[JSON] Pet :> Verb 'POST 200 '[JSON] () -- 'addPet' route
 :<|> "pet" :> Capture "petId" Integer :> Header "api_key" Text :> Verb 'DELETE 200 '[JSON] () -- 'deletePet' route
 :<|> "pet" :> "findByStatus" :> QueryParam "status" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByStatus' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> QueryParam "maxCount" Int :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> Capture "petId" Integer :> Verb 'GET 200 '[JSON] Pet -- 'getPetById' route
 :<|> "pet" :> ReqBody '[JSON] Pet :> Verb 'PUT 200 '[JSON] () -- 'updatePet' route
 :<|> "pet" :> Capture "petId" Integer :> ReqBody '[FormUrlEncoded] FormUpdatePetWithForm :> Verb 'POST 200 '[JSON] () -- 'updatePetWithForm' route
Expand DownExpand Up@@ -174,7 +174,7 @@ data OpenAPIPetstoreBackend m = OpenAPIPetstoreBackend
 { addPet :: Pet -> m (){- ^ -}
 , deletePet :: Integer -> Maybe Text -> m (){- ^ -}
 , findPetsByStatus :: Maybe [Text] -> m [Pet]{- ^ Multiple status values can be provided with comma separated strings -}
 , findPetsByTags :: Maybe [Text] -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , findPetsByTags :: Maybe [Text] -> Maybe Int -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , getPetById :: Integer -> m Pet{- ^ Returns a single pet -}
 , updatePet :: Pet -> m (){- ^ -}
 , updatePetWithForm :: Integer -> FormUpdatePetWithForm -> m (){- ^ -}
Expand Down

50 changes: 46 additions & 4 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
module OpenAPIPetstore.Types (
 ApiResponse (..),
 Category (..),
 InlineObject (..),
 InlineObject1 (..),
 Order (..),
 Pet (..),
 Tag (..),
Expand DownExpand Up@@ -62,6 +64,38 @@ instance ToSchema Category where
 $ removeFieldLabelPrefix False "category"


-- | 
data InlineObject = InlineObject
 { inlineObjectName :: Maybe Text -- ^ Updated name of the pet
 , inlineObjectStatus :: Maybe Text -- ^ Updated status of the pet
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject")
instance ToJSON InlineObject where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject")
instance ToSchema InlineObject where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject"


-- | 
data InlineObject1 = InlineObject1
 { inlineObject1AdditionalMetadata :: Maybe Text -- ^ Additional data to pass to server
 , inlineObject1File :: Maybe FilePath -- ^ file to upload
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject1 where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject1")
instance ToJSON InlineObject1 where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject1")
instance ToSchema InlineObject1 where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject1"


-- | An order for a pets from the pet store
data Order = Order
 { orderId :: Maybe Integer -- ^ 
Expand DownExpand Up@@ -144,10 +178,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand DownExpand Up@@ -190,4 +228,8 @@ removeFieldLabelPrefix _ prefix =
 , ("?", "'Question_Mark")
 , (">=", "'Greater_Than_Or_Equal_To")
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[haskell-servant] Fix parsing of special characters by f-f · Pull Request #2676 · OpenAPITools/openapi-generator · GitHub
Skip to content
[haskell-servant] Fix parsing of special characters#2676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

May 9, 2019
 Merged


[haskell-servant] Fix parsing of special characters
#2676
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand All@@ -81,4 +85,8 @@ removeFieldLabelPrefix _ prefix =
 [ {{#specialCharReplacements}}("{{&char}}", "{{&replacement}}"){{#hasMore}}
 , {{/hasMore}}{{/specialCharReplacements}}
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace

2 changes: 1 addition & 1 deletion
samples/server/petstore/haskell-servant/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.0.0-SNAPSHOT
4.0.0-beta3

4 changes: 2 additions & 2 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ type OpenAPIPetstoreAPI
 = "pet" :> ReqBody '[JSON] Pet :> Verb 'POST 200 '[JSON] () -- 'addPet' route
 :<|> "pet" :> Capture "petId" Integer :> Header "api_key" Text :> Verb 'DELETE 200 '[JSON] () -- 'deletePet' route
 :<|> "pet" :> "findByStatus" :> QueryParam "status" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByStatus' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> QueryParam "maxCount" Int :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> Capture "petId" Integer :> Verb 'GET 200 '[JSON] Pet -- 'getPetById' route
 :<|> "pet" :> ReqBody '[JSON] Pet :> Verb 'PUT 200 '[JSON] () -- 'updatePet' route
 :<|> "pet" :> Capture "petId" Integer :> ReqBody '[FormUrlEncoded] FormUpdatePetWithForm :> Verb 'POST 200 '[JSON] () -- 'updatePetWithForm' route
Expand DownExpand Up@@ -174,7 +174,7 @@ data OpenAPIPetstoreBackend m = OpenAPIPetstoreBackend
 { addPet :: Pet -> m (){- ^ -}
 , deletePet :: Integer -> Maybe Text -> m (){- ^ -}
 , findPetsByStatus :: Maybe [Text] -> m [Pet]{- ^ Multiple status values can be provided with comma separated strings -}
 , findPetsByTags :: Maybe [Text] -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , findPetsByTags :: Maybe [Text] -> Maybe Int -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , getPetById :: Integer -> m Pet{- ^ Returns a single pet -}
 , updatePet :: Pet -> m (){- ^ -}
 , updatePetWithForm :: Integer -> FormUpdatePetWithForm -> m (){- ^ -}
Expand Down

50 changes: 46 additions & 4 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
module OpenAPIPetstore.Types (
 ApiResponse (..),
 Category (..),
 InlineObject (..),
 InlineObject1 (..),
 Order (..),
 Pet (..),
 Tag (..),
Expand DownExpand Up@@ -62,6 +64,38 @@ instance ToSchema Category where
 $ removeFieldLabelPrefix False "category"


-- | 
data InlineObject = InlineObject
 { inlineObjectName :: Maybe Text -- ^ Updated name of the pet
 , inlineObjectStatus :: Maybe Text -- ^ Updated status of the pet
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject")
instance ToJSON InlineObject where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject")
instance ToSchema InlineObject where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject"


-- | 
data InlineObject1 = InlineObject1
 { inlineObject1AdditionalMetadata :: Maybe Text -- ^ Additional data to pass to server
 , inlineObject1File :: Maybe FilePath -- ^ file to upload
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject1 where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject1")
instance ToJSON InlineObject1 where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject1")
instance ToSchema InlineObject1 where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject1"


-- | An order for a pets from the pet store
data Order = Order
 { orderId :: Maybe Integer -- ^ 
Expand DownExpand Up@@ -144,10 +178,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand DownExpand Up@@ -190,4 +228,8 @@ removeFieldLabelPrefix _ prefix =
 , ("?", "'Question_Mark")
 , (">=", "'Greater_Than_Or_Equal_To")
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[haskell-servant] Fix parsing of special characters by f-f · Pull Request #2676 · OpenAPITools/openapi-generator · GitHub
Skip to content
[haskell-servant] Fix parsing of special characters#2676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

May 9, 2019
 Merged


[haskell-servant] Fix parsing of special characters
#2676
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand All@@ -81,4 +85,8 @@ removeFieldLabelPrefix _ prefix =
 [ {{#specialCharReplacements}}("{{&char}}", "{{&replacement}}"){{#hasMore}}
 , {{/hasMore}}{{/specialCharReplacements}}
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace

2 changes: 1 addition & 1 deletion
samples/server/petstore/haskell-servant/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.0.0-SNAPSHOT
4.0.0-beta3

4 changes: 2 additions & 2 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ type OpenAPIPetstoreAPI
 = "pet" :> ReqBody '[JSON] Pet :> Verb 'POST 200 '[JSON] () -- 'addPet' route
 :<|> "pet" :> Capture "petId" Integer :> Header "api_key" Text :> Verb 'DELETE 200 '[JSON] () -- 'deletePet' route
 :<|> "pet" :> "findByStatus" :> QueryParam "status" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByStatus' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> QueryParam "maxCount" Int :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> Capture "petId" Integer :> Verb 'GET 200 '[JSON] Pet -- 'getPetById' route
 :<|> "pet" :> ReqBody '[JSON] Pet :> Verb 'PUT 200 '[JSON] () -- 'updatePet' route
 :<|> "pet" :> Capture "petId" Integer :> ReqBody '[FormUrlEncoded] FormUpdatePetWithForm :> Verb 'POST 200 '[JSON] () -- 'updatePetWithForm' route
Expand DownExpand Up@@ -174,7 +174,7 @@ data OpenAPIPetstoreBackend m = OpenAPIPetstoreBackend
 { addPet :: Pet -> m (){- ^ -}
 , deletePet :: Integer -> Maybe Text -> m (){- ^ -}
 , findPetsByStatus :: Maybe [Text] -> m [Pet]{- ^ Multiple status values can be provided with comma separated strings -}
 , findPetsByTags :: Maybe [Text] -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , findPetsByTags :: Maybe [Text] -> Maybe Int -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , getPetById :: Integer -> m Pet{- ^ Returns a single pet -}
 , updatePet :: Pet -> m (){- ^ -}
 , updatePetWithForm :: Integer -> FormUpdatePetWithForm -> m (){- ^ -}
Expand Down

50 changes: 46 additions & 4 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
module OpenAPIPetstore.Types (
 ApiResponse (..),
 Category (..),
 InlineObject (..),
 InlineObject1 (..),
 Order (..),
 Pet (..),
 Tag (..),
Expand DownExpand Up@@ -62,6 +64,38 @@ instance ToSchema Category where
 $ removeFieldLabelPrefix False "category"


-- | 
data InlineObject = InlineObject
 { inlineObjectName :: Maybe Text -- ^ Updated name of the pet
 , inlineObjectStatus :: Maybe Text -- ^ Updated status of the pet
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject")
instance ToJSON InlineObject where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject")
instance ToSchema InlineObject where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject"


-- | 
data InlineObject1 = InlineObject1
 { inlineObject1AdditionalMetadata :: Maybe Text -- ^ Additional data to pass to server
 , inlineObject1File :: Maybe FilePath -- ^ file to upload
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject1 where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject1")
instance ToJSON InlineObject1 where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject1")
instance ToSchema InlineObject1 where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject1"


-- | An order for a pets from the pet store
data Order = Order
 { orderId :: Maybe Integer -- ^ 
Expand DownExpand Up@@ -144,10 +178,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand DownExpand Up@@ -190,4 +228,8 @@ removeFieldLabelPrefix _ prefix =
 , ("?", "'Question_Mark")
 , (">=", "'Greater_Than_Or_Equal_To")
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[haskell-servant] Fix parsing of special characters by f-f · Pull Request #2676 · OpenAPITools/openapi-generator · GitHub
Skip to content
[haskell-servant] Fix parsing of special characters#2676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

May 9, 2019
 Merged


[haskell-servant] Fix parsing of special characters
#2676
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand All@@ -81,4 +85,8 @@ removeFieldLabelPrefix _ prefix =
 [ {{#specialCharReplacements}}("{{&char}}", "{{&replacement}}"){{#hasMore}}
 , {{/hasMore}}{{/specialCharReplacements}}
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace

2 changes: 1 addition & 1 deletion
samples/server/petstore/haskell-servant/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.0.0-SNAPSHOT
4.0.0-beta3

4 changes: 2 additions & 2 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ type OpenAPIPetstoreAPI
 = "pet" :> ReqBody '[JSON] Pet :> Verb 'POST 200 '[JSON] () -- 'addPet' route
 :<|> "pet" :> Capture "petId" Integer :> Header "api_key" Text :> Verb 'DELETE 200 '[JSON] () -- 'deletePet' route
 :<|> "pet" :> "findByStatus" :> QueryParam "status" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByStatus' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> QueryParam "maxCount" Int :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> Capture "petId" Integer :> Verb 'GET 200 '[JSON] Pet -- 'getPetById' route
 :<|> "pet" :> ReqBody '[JSON] Pet :> Verb 'PUT 200 '[JSON] () -- 'updatePet' route
 :<|> "pet" :> Capture "petId" Integer :> ReqBody '[FormUrlEncoded] FormUpdatePetWithForm :> Verb 'POST 200 '[JSON] () -- 'updatePetWithForm' route
Expand DownExpand Up@@ -174,7 +174,7 @@ data OpenAPIPetstoreBackend m = OpenAPIPetstoreBackend
 { addPet :: Pet -> m (){- ^ -}
 , deletePet :: Integer -> Maybe Text -> m (){- ^ -}
 , findPetsByStatus :: Maybe [Text] -> m [Pet]{- ^ Multiple status values can be provided with comma separated strings -}
 , findPetsByTags :: Maybe [Text] -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , findPetsByTags :: Maybe [Text] -> Maybe Int -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , getPetById :: Integer -> m Pet{- ^ Returns a single pet -}
 , updatePet :: Pet -> m (){- ^ -}
 , updatePetWithForm :: Integer -> FormUpdatePetWithForm -> m (){- ^ -}
Expand Down

50 changes: 46 additions & 4 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
module OpenAPIPetstore.Types (
 ApiResponse (..),
 Category (..),
 InlineObject (..),
 InlineObject1 (..),
 Order (..),
 Pet (..),
 Tag (..),
Expand DownExpand Up@@ -62,6 +64,38 @@ instance ToSchema Category where
 $ removeFieldLabelPrefix False "category"


-- | 
data InlineObject = InlineObject
 { inlineObjectName :: Maybe Text -- ^ Updated name of the pet
 , inlineObjectStatus :: Maybe Text -- ^ Updated status of the pet
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject")
instance ToJSON InlineObject where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject")
instance ToSchema InlineObject where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject"


-- | 
data InlineObject1 = InlineObject1
 { inlineObject1AdditionalMetadata :: Maybe Text -- ^ Additional data to pass to server
 , inlineObject1File :: Maybe FilePath -- ^ file to upload
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject1 where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject1")
instance ToJSON InlineObject1 where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject1")
instance ToSchema InlineObject1 where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject1"


-- | An order for a pets from the pet store
data Order = Order
 { orderId :: Maybe Integer -- ^ 
Expand DownExpand Up@@ -144,10 +178,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand DownExpand Up@@ -190,4 +228,8 @@ removeFieldLabelPrefix _ prefix =
 , ("?", "'Question_Mark")
 , (">=", "'Greater_Than_Or_Equal_To")
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[haskell-servant] Fix parsing of special characters by f-f · Pull Request #2676 · OpenAPITools/openapi-generator · GitHub
Skip to content
[haskell-servant] Fix parsing of special characters#2676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

May 9, 2019
 Merged


[haskell-servant] Fix parsing of special characters
#2676
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand All@@ -81,4 +85,8 @@ removeFieldLabelPrefix _ prefix =
 [ {{#specialCharReplacements}}("{{&char}}", "{{&replacement}}"){{#hasMore}}
 , {{/hasMore}}{{/specialCharReplacements}}
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace

2 changes: 1 addition & 1 deletion
samples/server/petstore/haskell-servant/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.0.0-SNAPSHOT
4.0.0-beta3

4 changes: 2 additions & 2 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ type OpenAPIPetstoreAPI
 = "pet" :> ReqBody '[JSON] Pet :> Verb 'POST 200 '[JSON] () -- 'addPet' route
 :<|> "pet" :> Capture "petId" Integer :> Header "api_key" Text :> Verb 'DELETE 200 '[JSON] () -- 'deletePet' route
 :<|> "pet" :> "findByStatus" :> QueryParam "status" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByStatus' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> QueryParam "maxCount" Int :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> Capture "petId" Integer :> Verb 'GET 200 '[JSON] Pet -- 'getPetById' route
 :<|> "pet" :> ReqBody '[JSON] Pet :> Verb 'PUT 200 '[JSON] () -- 'updatePet' route
 :<|> "pet" :> Capture "petId" Integer :> ReqBody '[FormUrlEncoded] FormUpdatePetWithForm :> Verb 'POST 200 '[JSON] () -- 'updatePetWithForm' route
Expand DownExpand Up@@ -174,7 +174,7 @@ data OpenAPIPetstoreBackend m = OpenAPIPetstoreBackend
 { addPet :: Pet -> m (){- ^ -}
 , deletePet :: Integer -> Maybe Text -> m (){- ^ -}
 , findPetsByStatus :: Maybe [Text] -> m [Pet]{- ^ Multiple status values can be provided with comma separated strings -}
 , findPetsByTags :: Maybe [Text] -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , findPetsByTags :: Maybe [Text] -> Maybe Int -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , getPetById :: Integer -> m Pet{- ^ Returns a single pet -}
 , updatePet :: Pet -> m (){- ^ -}
 , updatePetWithForm :: Integer -> FormUpdatePetWithForm -> m (){- ^ -}
Expand Down

50 changes: 46 additions & 4 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
module OpenAPIPetstore.Types (
 ApiResponse (..),
 Category (..),
 InlineObject (..),
 InlineObject1 (..),
 Order (..),
 Pet (..),
 Tag (..),
Expand DownExpand Up@@ -62,6 +64,38 @@ instance ToSchema Category where
 $ removeFieldLabelPrefix False "category"


-- | 
data InlineObject = InlineObject
 { inlineObjectName :: Maybe Text -- ^ Updated name of the pet
 , inlineObjectStatus :: Maybe Text -- ^ Updated status of the pet
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject")
instance ToJSON InlineObject where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject")
instance ToSchema InlineObject where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject"


-- | 
data InlineObject1 = InlineObject1
 { inlineObject1AdditionalMetadata :: Maybe Text -- ^ Additional data to pass to server
 , inlineObject1File :: Maybe FilePath -- ^ file to upload
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject1 where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject1")
instance ToJSON InlineObject1 where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject1")
instance ToSchema InlineObject1 where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject1"


-- | An order for a pets from the pet store
data Order = Order
 { orderId :: Maybe Integer -- ^ 
Expand DownExpand Up@@ -144,10 +178,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand DownExpand Up@@ -190,4 +228,8 @@ removeFieldLabelPrefix _ prefix =
 , ("?", "'Question_Mark")
 , (">=", "'Greater_Than_Or_Equal_To")
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[haskell-servant] Fix parsing of special characters by f-f · Pull Request #2676 · OpenAPITools/openapi-generator · GitHub
Skip to content
[haskell-servant] Fix parsing of special characters#2676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

May 9, 2019
 Merged


[haskell-servant] Fix parsing of special characters
#2676
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand All@@ -81,4 +85,8 @@ removeFieldLabelPrefix _ prefix =
 [ {{#specialCharReplacements}}("{{&char}}", "{{&replacement}}"){{#hasMore}}
 , {{/hasMore}}{{/specialCharReplacements}}
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace

2 changes: 1 addition & 1 deletion
samples/server/petstore/haskell-servant/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.0.0-SNAPSHOT
4.0.0-beta3

4 changes: 2 additions & 2 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ type OpenAPIPetstoreAPI
 = "pet" :> ReqBody '[JSON] Pet :> Verb 'POST 200 '[JSON] () -- 'addPet' route
 :<|> "pet" :> Capture "petId" Integer :> Header "api_key" Text :> Verb 'DELETE 200 '[JSON] () -- 'deletePet' route
 :<|> "pet" :> "findByStatus" :> QueryParam "status" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByStatus' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> "findByTags" :> QueryParam "tags" (QueryList 'CommaSeparated (Text)) :> QueryParam "maxCount" Int :> Verb 'GET 200 '[JSON] [Pet] -- 'findPetsByTags' route
 :<|> "pet" :> Capture "petId" Integer :> Verb 'GET 200 '[JSON] Pet -- 'getPetById' route
 :<|> "pet" :> ReqBody '[JSON] Pet :> Verb 'PUT 200 '[JSON] () -- 'updatePet' route
 :<|> "pet" :> Capture "petId" Integer :> ReqBody '[FormUrlEncoded] FormUpdatePetWithForm :> Verb 'POST 200 '[JSON] () -- 'updatePetWithForm' route
Expand DownExpand Up@@ -174,7 +174,7 @@ data OpenAPIPetstoreBackend m = OpenAPIPetstoreBackend
 { addPet :: Pet -> m (){- ^ -}
 , deletePet :: Integer -> Maybe Text -> m (){- ^ -}
 , findPetsByStatus :: Maybe [Text] -> m [Pet]{- ^ Multiple status values can be provided with comma separated strings -}
 , findPetsByTags :: Maybe [Text] -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , findPetsByTags :: Maybe [Text] -> Maybe Int -> m [Pet]{- ^ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. -}
 , getPetById :: Integer -> m Pet{- ^ Returns a single pet -}
 , updatePet :: Pet -> m (){- ^ -}
 , updatePetWithForm :: Integer -> FormUpdatePetWithForm -> m (){- ^ -}
Expand Down

50 changes: 46 additions & 4 deletions
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
module OpenAPIPetstore.Types (
 ApiResponse (..),
 Category (..),
 InlineObject (..),
 InlineObject1 (..),
 Order (..),
 Pet (..),
 Tag (..),
Expand DownExpand Up@@ -62,6 +64,38 @@ instance ToSchema Category where
 $ removeFieldLabelPrefix False "category"


-- | 
data InlineObject = InlineObject
 { inlineObjectName :: Maybe Text -- ^ Updated name of the pet
 , inlineObjectStatus :: Maybe Text -- ^ Updated status of the pet
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject")
instance ToJSON InlineObject where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject")
instance ToSchema InlineObject where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject"


-- | 
data InlineObject1 = InlineObject1
 { inlineObject1AdditionalMetadata :: Maybe Text -- ^ Additional data to pass to server
 , inlineObject1File :: Maybe FilePath -- ^ file to upload
 } deriving (Show, Eq, Generic, Data)

instance FromJSON InlineObject1 where
 parseJSON = genericParseJSON (removeFieldLabelPrefix True "inlineObject1")
instance ToJSON InlineObject1 where
 toJSON = genericToJSON (removeFieldLabelPrefix False "inlineObject1")
instance ToSchema InlineObject1 where
 declareNamedSchema = Swagger.genericDeclareNamedSchema
 $ Swagger.fromAesonOptions
 $ removeFieldLabelPrefix False "inlineObject1"


-- | An order for a pets from the pet store
data Order = Order
 { orderId :: Maybe Integer -- ^ 
Expand DownExpand Up@@ -144,10 +178,14 @@ uncapitalize :: String -> String
uncapitalize (first:rest) = Char.toLower first : rest
uncapitalize [] = []

-- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- | Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters.
-- The @forParsing@ parameter is to distinguish between the cases in which we're using this
-- to power a @FromJSON@ or a @ToJSON@ instance. In the first case we're parsing, and we want
-- to replace special characters with their quoted equivalents (because we cannot have special
-- chars in identifier names), while we want to do viceversa when sending data instead.
removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix _ prefix =
removeFieldLabelPrefix forParsing prefix =
 defaultOptions
 { omitNothingFields = True
 , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
Expand DownExpand Up@@ -190,4 +228,8 @@ removeFieldLabelPrefix _ prefix =
 , ("?", "'Question_Mark")
 , (">=", "'Greater_Than_Or_Equal_To")
 ]
 mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
 mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
 replacer =
 if forParsing
 then flip T.replace
 else T.replace