Skip to content

Commit a8eb220

Browse files
gazerrogazerro
committed
cmd/scriggo: move globals variable to a separate file
This change moves the 'globals' variable declaration from the serve.go file into its own separate file.
1 parent c47f808 commit a8eb220

File tree

2 files changed

+109
-97
lines changed

2 files changed

+109
-97
lines changed

‎cmd/scriggo/globals.go

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
// Copyright 2021 The Scriggo Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style
3+
// license that can be found in the LICENSE file.
4+
5+
package main
6+
7+
import (
8+
"reflect"
9+
"time"
10+
11+
"github.com/open2b/scriggo/builtin"
12+
"github.com/open2b/scriggo/native"
13+
)
14+
15+
var globals = native.Declarations{
16+
// crypto
17+
"hmacSHA1": builtin.HmacSHA1,
18+
"hmacSHA256": builtin.HmacSHA256,
19+
"sha1": builtin.Sha1,
20+
"sha256": builtin.Sha256,
21+
22+
// debug
23+
"version": version(),
24+
25+
// encoding
26+
"base64": builtin.Base64,
27+
"hex": builtin.Hex,
28+
"marshalJSON": builtin.MarshalJSON,
29+
"marshalJSONIndent": builtin.MarshalJSONIndent,
30+
"marshalYAML": builtin.MarshalYAML,
31+
"md5": builtin.Md5,
32+
"unmarshalJSON": builtin.UnmarshalJSON,
33+
"unmarshalYAML": builtin.UnmarshalYAML,
34+
35+
// html
36+
"htmlEscape": builtin.HtmlEscape,
37+
38+
// math
39+
"abs": builtin.Abs,
40+
"max": builtin.Max,
41+
"min": builtin.Min,
42+
"pow": builtin.Pow,
43+
44+
// net
45+
"File": reflect.TypeOf((*builtin.File)(nil)).Elem(),
46+
"FormData": reflect.TypeOf(builtin.FormData{}),
47+
"form": (*builtin.FormData)(nil),
48+
"queryEscape": builtin.QueryEscape,
49+
50+
// regexp
51+
"Regexp": reflect.TypeOf(builtin.Regexp{}),
52+
"regexp": builtin.RegExp,
53+
54+
// sort
55+
"reverse": builtin.Reverse,
56+
"sort": builtin.Sort,
57+
58+
// strconv
59+
"formatFloat": builtin.FormatFloat,
60+
"formatInt": builtin.FormatInt,
61+
"parseFloat": builtin.ParseFloat,
62+
"parseInt": builtin.ParseInt,
63+
64+
// strings
65+
"abbreviate": builtin.Abbreviate,
66+
"capitalize": builtin.Capitalize,
67+
"capitalizeAll": builtin.CapitalizeAll,
68+
"hasPrefix": builtin.HasPrefix,
69+
"hasSuffix": builtin.HasSuffix,
70+
"index": builtin.Index,
71+
"indexAny": builtin.IndexAny,
72+
"join": builtin.Join,
73+
"lastIndex": builtin.LastIndex,
74+
"replace": builtin.Replace,
75+
"replaceAll": builtin.ReplaceAll,
76+
"runeCount": builtin.RuneCount,
77+
"split": builtin.Split,
78+
"splitAfter": builtin.SplitAfter,
79+
"splitAfterN": builtin.SplitAfterN,
80+
"splitN": builtin.SplitN,
81+
"sprint": builtin.Sprint,
82+
"sprintf": builtin.Sprintf,
83+
"toKebab": builtin.ToKebab,
84+
"toLower": builtin.ToLower,
85+
"toUpper": builtin.ToUpper,
86+
"trim": builtin.Trim,
87+
"trimLeft": builtin.TrimLeft,
88+
"trimPrefix": builtin.TrimPrefix,
89+
"trimRight": builtin.TrimRight,
90+
"trimSuffix": builtin.TrimSuffix,
91+
92+
// time
93+
"Duration": reflect.TypeOf(builtin.Duration(0)),
94+
"Hour": time.Hour,
95+
"Microsecond": time.Microsecond,
96+
"Millisecond": time.Millisecond,
97+
"Minute": time.Minute,
98+
"Nanosecond": time.Nanosecond,
99+
"Second": time.Second,
100+
"Time": reflect.TypeOf(builtin.Time{}),
101+
"date": builtin.Date,
102+
"now": builtin.Now,
103+
"parseDuration": builtin.ParseDuration,
104+
"parseTime": builtin.ParseTime,
105+
"unixTime": builtin.UnixTime,
106+
107+
// unsafeconv
108+
"unsafeconv": builtin.Unsafeconv,
109+
}

‎cmd/scriggo/serve.go

Lines changed: 0 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"net/http"
1313
"os"
1414
"path"
15-
"reflect"
1615
"strings"
1716
"sync"
1817
"time"
@@ -270,99 +269,3 @@ func (srv *server) logf(format string, a ...interface{}) {
270269
println()
271270
srv.metrics.header = true
272271
}
273-
274-
var globals = native.Declarations{
275-
// crypto
276-
"hmacSHA1": builtin.HmacSHA1,
277-
"hmacSHA256": builtin.HmacSHA256,
278-
"sha1": builtin.Sha1,
279-
"sha256": builtin.Sha256,
280-
281-
// debug
282-
"version": version(),
283-
284-
// encoding
285-
"base64": builtin.Base64,
286-
"hex": builtin.Hex,
287-
"marshalJSON": builtin.MarshalJSON,
288-
"marshalJSONIndent": builtin.MarshalJSONIndent,
289-
"marshalYAML": builtin.MarshalYAML,
290-
"md5": builtin.Md5,
291-
"unmarshalJSON": builtin.UnmarshalJSON,
292-
"unmarshalYAML": builtin.UnmarshalYAML,
293-
294-
// html
295-
"htmlEscape": builtin.HtmlEscape,
296-
297-
// math
298-
"abs": builtin.Abs,
299-
"max": builtin.Max,
300-
"min": builtin.Min,
301-
"pow": builtin.Pow,
302-
303-
// net
304-
"File": reflect.TypeOf((*builtin.File)(nil)).Elem(),
305-
"FormData": reflect.TypeOf(builtin.FormData{}),
306-
"form": (*builtin.FormData)(nil),
307-
"queryEscape": builtin.QueryEscape,
308-
309-
// regexp
310-
"Regexp": reflect.TypeOf(builtin.Regexp{}),
311-
"regexp": builtin.RegExp,
312-
313-
// sort
314-
"reverse": builtin.Reverse,
315-
"sort": builtin.Sort,
316-
317-
// strconv
318-
"formatFloat": builtin.FormatFloat,
319-
"formatInt": builtin.FormatInt,
320-
"parseFloat": builtin.ParseFloat,
321-
"parseInt": builtin.ParseInt,
322-
323-
// strings
324-
"abbreviate": builtin.Abbreviate,
325-
"capitalize": builtin.Capitalize,
326-
"capitalizeAll": builtin.CapitalizeAll,
327-
"hasPrefix": builtin.HasPrefix,
328-
"hasSuffix": builtin.HasSuffix,
329-
"index": builtin.Index,
330-
"indexAny": builtin.IndexAny,
331-
"join": builtin.Join,
332-
"lastIndex": builtin.LastIndex,
333-
"replace": builtin.Replace,
334-
"replaceAll": builtin.ReplaceAll,
335-
"runeCount": builtin.RuneCount,
336-
"split": builtin.Split,
337-
"splitAfter": builtin.SplitAfter,
338-
"splitAfterN": builtin.SplitAfterN,
339-
"splitN": builtin.SplitN,
340-
"sprint": builtin.Sprint,
341-
"sprintf": builtin.Sprintf,
342-
"toKebab": builtin.ToKebab,
343-
"toLower": builtin.ToLower,
344-
"toUpper": builtin.ToUpper,
345-
"trim": builtin.Trim,
346-
"trimLeft": builtin.TrimLeft,
347-
"trimPrefix": builtin.TrimPrefix,
348-
"trimRight": builtin.TrimRight,
349-
"trimSuffix": builtin.TrimSuffix,
350-
351-
// time
352-
"Duration": reflect.TypeOf(builtin.Duration(0)),
353-
"Hour": time.Hour,
354-
"Microsecond": time.Microsecond,
355-
"Millisecond": time.Millisecond,
356-
"Minute": time.Minute,
357-
"Nanosecond": time.Nanosecond,
358-
"Second": time.Second,
359-
"Time": reflect.TypeOf(builtin.Time{}),
360-
"date": builtin.Date,
361-
"now": builtin.Now,
362-
"parseDuration": builtin.ParseDuration,
363-
"parseTime": builtin.ParseTime,
364-
"unixTime": builtin.UnixTime,
365-
366-
// unsafeconv
367-
"unsafeconv": builtin.Unsafeconv,
368-
}

0 commit comments

Comments
 (0)